Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -r77e263b43c7aed360e8dcc46af273db55123bc83 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -252,6 +252,14 @@
             column="reflect_on_activity"
         />
 
+        <property
+            name="notifyLearnersOnMarkRelease"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="mark_release_notify"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Forum.xml
Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rb93c0a14919af5bff7e1a99168c91f4057799c51 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b93c0a14919af5bff7e1a99168c91f4057799c51)
+++ lams_tool_forum/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -186,5 +186,10 @@
 monitor.summary.td.addNotebook  =Add Notebook at the end of Forum
 monitor.summary.td.notebookInstructions  =Notebook instructions
 
+label.authoring.advanced.notify.mark.release=Notify learners when marks are released
+event.mark.release.subject=LAMS: Marks were released
+event.mark.release.body=A teacher released marks in a Forum activity in LAMS.\nYour marks are:\n\n{0}\nThis message was send automatically, please do not reply to it.
+event.mark.release.mark=For the message titled "{0}" posted on {1} the mark is {2}\n
 
+
 #======= End labels: Exported 179 labels for en AU =====
Index: lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rb93c0a14919af5bff7e1a99168c91f4057799c51 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision b93c0a14919af5bff7e1a99168c91f4057799c51)
+++ lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -186,5 +186,8 @@
 monitor.summary.td.addNotebook  =Add Notebook at the end of Forum
 monitor.summary.td.notebookInstructions  =Notebook instructions
 
-
+label.authoring.advanced.notify.mark.release=Notify learners when marks are released
+event.mark.release.subject=LAMS: Marks were released
+event.mark.release.body=A teacher released marks in a Forum activity in LAMS.\nYour marks are:\n\n{0}\nThis message was send automatically, please do not reply to it.
+event.mark.release.mark=For the message titled "{0}" posted on {1} the mark is {2}\n
 #======= End labels: Exported 179 labels for en AU =====
Index: lams_tool_forum/db/model/forum.clay
===================================================================
diff -u -r5cf94a873af22670c1bcfb832c7e868ef168333a -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/db/model/forum.clay	(.../forum.clay)	(revision 5cf94a873af22670c1bcfb832c7e868ef168333a)
+++ lams_tool_forum/db/model/forum.clay	(.../forum.clay)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -1,943 +1,956 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<clay-model clay-version="1.4.0">
-<database-model alias="" author="" begin-script="" end-script="" name="imscp" remarks="" sql-dialect-id="jp.azzurri.clay.dialect.MySQL_4_0_Dialect" uid="3c59d3:1182f36109d:-8000" version="1.0">
-<database-model-description></database-model-description>
-<schema-list>
-<schema alias="" name="LAMS" remarks="" uid="3c59d3:1182f36109d:-7fff">
-<schema-description></schema-description>
-<domain-list/>
-<table-list/>
-</schema>
-<schema alias="" name="DEFAULT_SCHEMA" remarks="" uid="3c59d3:1182f36109d:-7ffe">
-<schema-description></schema-description>
-<domain-list/>
-<table-list>
-<table alias="" name="tl_lafrum11_attachment" remarks="" uid="3c59d3:1182f36109d:-7ffd">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="107" y="375"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="3c59d3:1182f36109d:-7ffb">
-<column-description></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="false" name="file_version_id" remarks="" uid="3c59d3:1182f36109d:-7ffa">
-<column-description></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="255" decimal-digits="0" default-value="" mandatory="false" name="file_type" remarks="" uid="3c59d3:1182f36109d:-7ff9">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="file_name" remarks="" uid="3c59d3:1182f36109d:-7ff8">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="file_uuid" remarks="" uid="3c59d3:1182f36109d:-7ff7">
-<column-description></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="19" decimal-digits="0" default-value="" mandatory="false" name="create_date" remarks="" uid="3c59d3:1182f36109d:-7ff6">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
-<variant type-name-pattern="DATETIME"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="forum_uid" remarks="" uid="3c59d3:1182f36109d:-7ff5">
-<column-description></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="false" name="message_uid" remarks="" uid="3c59d3:1182f36109d:-7ff4">
-<column-description></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="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7ffc">
-<primary-key-description></primary-key-description>
-<primary-key-column name="uid"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK389AD9A2131CE31E" on-delete="NO ACTION" on-update="NO ACTION" 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="3c59d3:1182f36109d:-7f9f">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="forum_uid" referenced-key-column-name="uid"/>
-</foreign-key>
-<foreign-key alias="" name="FK389AD9A2FE939F2A" on-delete="NO ACTION" on-update="NO ACTION" 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="3c59d3:1182f36109d:-7f9e">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="message_uid" referenced-key-column-name="uid"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7ff3" unique="false">
-<index-description></index-description>
-<index-column name="uid" sort="ASC"/>
-</index>
-<index alias="" name="FK389AD9A2FE939F2A" remarks="" uid="3c59d3:1182f36109d:-7ff2" unique="true">
-<index-description></index-description>
-<index-column name="message_uid" sort="ASC"/>
-</index>
-<index alias="" name="FK389AD9A2131CE31E" remarks="" uid="3c59d3:1182f36109d:-7ff1" unique="true">
-<index-description></index-description>
-<index-column name="forum_uid" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="tl_lafrum11_forum" remarks="" uid="3c59d3:1182f36109d:-7ff0">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="50" y="8"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="3c59d3:1182f36109d:-7fee">
-<column-description></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="19" decimal-digits="0" default-value="" mandatory="false" name="create_date" remarks="" uid="3c59d3:1182f36109d:-7fed">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
-<variant type-name-pattern="DATETIME"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="19" decimal-digits="0" default-value="" mandatory="false" name="update_date" remarks="" uid="3c59d3:1182f36109d:-7fec">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
-<variant type-name-pattern="DATETIME"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="create_by" remarks="" uid="3c59d3:1182f36109d:-7feb">
-<column-description></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="255" decimal-digits="0" default-value="" mandatory="false" name="title" remarks="" uid="3c59d3:1182f36109d:-7fea">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="allow_anonym" remarks="" uid="3c59d3:1182f36109d:-7fe9">
-<column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="run_offline" remarks="" uid="3c59d3:1182f36109d:-7fe8">
-<column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="lock_on_finished" remarks="" uid="3c59d3:1182f36109d:-7fe7">
-<column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="instructions" remarks="" uid="3c59d3:1182f36109d:-7fe6">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="online_instructions" remarks="" uid="3c59d3:1182f36109d:-7fe5">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="offline_instructions" remarks="" uid="3c59d3:1182f36109d:-7fe4">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="content_in_use" remarks="" uid="3c59d3:1182f36109d:-7fe3">
-<column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="define_later" remarks="" uid="3c59d3:1182f36109d:-7fe2">
-<column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="content_id" remarks="" uid="3c59d3:1182f36109d:-7fe1">
-<column-description></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="1" decimal-digits="0" default-value="" mandatory="false" name="allow_edit" remarks="" uid="3c59d3:1182f36109d:-7fe0">
-<column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="allow_rich_editor" remarks="" uid="3c59d3:1182f36109d:-7fdf">
-<column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fef">
-<primary-key-description></primary-key-description>
-<primary-key-column name="uid"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list>
-<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fde" unique="false">
-<index-description></index-description>
-<index-column name="uid" sort="ASC"/>
-</index>
-<index alias="" name="content_id" remarks="" uid="3c59d3:1182f36109d:-7fdd" unique="false">
-<index-description></index-description>
-<index-column name="content_id" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="tl_lafrum11_forum_user" remarks="" uid="3c59d3:1182f36109d:-7fdc">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="336" y="175"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="3c59d3:1182f36109d:-7fda">
-<column-description></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="false" name="user_id" remarks="" uid="3c59d3:1182f36109d:-7fd9">
-<column-description></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="255" decimal-digits="0" default-value="" mandatory="false" name="last_name" remarks="" uid="3c59d3:1182f36109d:-7fd8">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="first_name" remarks="" uid="3c59d3:1182f36109d:-7fd7">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="session_id" remarks="" uid="3c59d3:1182f36109d:-7fd6">
-<column-description></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="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fdb">
-<primary-key-description></primary-key-description>
-<primary-key-column name="uid"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK7B83A4A85F0116B6" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lafrum11_tool_session" 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="3c59d3:1182f36109d:-7f9d">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="session_id" referenced-key-column-name="uid"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fd5" unique="false">
-<index-description></index-description>
-<index-column name="uid" sort="ASC"/>
-</index>
-<index alias="" name="FK7B83A4A85F0116B6" remarks="" uid="3c59d3:1182f36109d:-7fd4" unique="true">
-<index-description></index-description>
-<index-column name="session_id" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="tl_lafrum11_message" remarks="" uid="3c59d3:1182f36109d:-7fd3">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="377" y="324"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="3c59d3:1182f36109d:-7fd1">
-<column-description></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="19" decimal-digits="0" default-value="" mandatory="false" name="create_date" remarks="" uid="3c59d3:1182f36109d:-7fd0">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
-<variant type-name-pattern="DATETIME"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="19" decimal-digits="0" default-value="" mandatory="false" name="last_reply_date" remarks="" uid="3c59d3:1182f36109d:-7fcf">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
-<variant type-name-pattern="DATETIME"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="19" decimal-digits="0" default-value="" mandatory="false" name="update_date" remarks="" uid="3c59d3:1182f36109d:-7fce">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
-<variant type-name-pattern="DATETIME"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="create_by" remarks="" uid="3c59d3:1182f36109d:-7fcd">
-<column-description></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="false" name="modified_by" remarks="" uid="3c59d3:1182f36109d:-7fcc">
-<column-description></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="255" decimal-digits="0" default-value="" mandatory="false" name="subject" remarks="" uid="3c59d3:1182f36109d:-7fcb">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="body" remarks="" uid="3c59d3:1182f36109d:-7fca">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="is_authored" remarks="" uid="3c59d3:1182f36109d:-7fc9">
-<column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="is_anonymous" remarks="" uid="3c59d3:1182f36109d:-7fc8">
-<column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="forum_session_uid" remarks="" uid="3c59d3:1182f36109d:-7fc7">
-<column-description></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="false" name="parent_uid" remarks="" uid="3c59d3:1182f36109d:-7fc6">
-<column-description></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="false" name="forum_uid" remarks="" uid="3c59d3:1182f36109d:-7fc5">
-<column-description></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="11" decimal-digits="0" default-value="" mandatory="false" name="reply_number" remarks="" uid="3c59d3:1182f36109d:-7fc4">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INT" selected-variant-pattern="INT(%n)">
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n)"/>
-<variant type-name-pattern="INT"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) ZEROFILL"/>
-<variant type-name-pattern="INT UNSIGNED"/>
-<variant type-name-pattern="INT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="hide_flag" remarks="" uid="3c59d3:1182f36109d:-7fc3">
-<column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="report_id" remarks="" uid="3c59d3:1182f36109d:-7fc2">
-<column-description></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="false" name="authored_parent_uid" remarks="" uid="3c59d3:1182f36109d:-7f91">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT(%n)">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<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="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fd2">
-<primary-key-description></primary-key-description>
-<primary-key-column name="uid"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK4A6067E8647A7264" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lafrum11_forum_user" 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="3c59d3:1182f36109d:-7f9c">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="modified_by" referenced-key-column-name="uid"/>
-</foreign-key>
-<foreign-key alias="" name="FK4A6067E8131CE31E" on-delete="NO ACTION" on-update="NO ACTION" 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="3c59d3:1182f36109d:-7f9b">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="forum_uid" referenced-key-column-name="uid"/>
-</foreign-key>
-<foreign-key alias="" name="FK4A6067E824089E4D" on-delete="NO ACTION" on-update="NO ACTION" 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="3c59d3:1182f36109d:-7f9a">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="parent_uid" referenced-key-column-name="uid"/>
-</foreign-key>
-<foreign-key alias="" name="FK4A6067E89357B45B" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lafrum11_tool_session" 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="3c59d3:1182f36109d:-7f99">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="forum_session_uid" referenced-key-column-name="uid"/>
-</foreign-key>
-<foreign-key alias="" name="FK4A6067E897F0DB46" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lafrum11_report" 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="3c59d3:1182f36109d:-7f98">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="report_id" referenced-key-column-name="uid"/>
-</foreign-key>
-<foreign-key alias="" name="FK4A6067E8E42F4351" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lafrum11_forum_user" 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="3c59d3:1182f36109d:-7f97">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="create_by" referenced-key-column-name="uid"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fc1" unique="false">
-<index-description></index-description>
-<index-column name="uid" sort="ASC"/>
-</index>
-<index alias="" name="FK4A6067E8E42F4351" remarks="" uid="3c59d3:1182f36109d:-7fc0" unique="true">
-<index-description></index-description>
-<index-column name="create_by" sort="ASC"/>
-</index>
-<index alias="" name="FK4A6067E897F0DB46" remarks="" uid="3c59d3:1182f36109d:-7fbf" unique="true">
-<index-description></index-description>
-<index-column name="report_id" sort="ASC"/>
-</index>
-<index alias="" name="FK4A6067E8131CE31E" remarks="" uid="3c59d3:1182f36109d:-7fbe" unique="true">
-<index-description></index-description>
-<index-column name="forum_uid" sort="ASC"/>
-</index>
-<index alias="" name="FK4A6067E824089E4D" remarks="" uid="3c59d3:1182f36109d:-7fbd" unique="true">
-<index-description></index-description>
-<index-column name="parent_uid" sort="ASC"/>
-</index>
-<index alias="" name="FK4A6067E89357B45B" remarks="" uid="3c59d3:1182f36109d:-7fbc" unique="true">
-<index-description></index-description>
-<index-column name="forum_session_uid" sort="ASC"/>
-</index>
-<index alias="" name="FK4A6067E8647A7264" remarks="" uid="3c59d3:1182f36109d:-7fbb" unique="true">
-<index-description></index-description>
-<index-column name="modified_by" sort="ASC"/>
-</index>
-<index alias="" name="IX_msg_auth_parent" remarks="" uid="3c59d3:1182f36109d:-7f8e" unique="false">
-<index-description></index-description>
-<index-column name="authored_parent_uid" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="tl_lafrum11_message_seq" remarks="" uid="3c59d3:1182f36109d:-7fba">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="689" y="313"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="3c59d3:1182f36109d:-7fb8">
-<column-description></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="false" name="root_message_uid" remarks="" uid="3c59d3:1182f36109d:-7fb7">
-<column-description></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="false" name="message_uid" remarks="" uid="3c59d3:1182f36109d:-7fb6">
-<column-description></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="6" decimal-digits="0" default-value="" mandatory="false" name="message_level" remarks="" uid="3c59d3:1182f36109d:-7fb5">
-<column-description></column-description>
-<data-type jdbc-type="5" name="SMALLINT" selected-variant-pattern="SMALLINT(%n)">
-<variant precision-max="5" precision-min="0" precision-variable="%n" type-name-pattern="SMALLINT(%n)"/>
-<variant type-name-pattern="SMALLINT"/>
-<variant precision-max="5" precision-min="0" precision-variable="%n" type-name-pattern="SMALLINT(%n) UNSIGNED"/>
-<variant precision-max="5" precision-min="0" precision-variable="%n" type-name-pattern="SMALLINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="5" precision-min="0" precision-variable="%n" type-name-pattern="SMALLINT(%n) ZEROFILL"/>
-<variant type-name-pattern="SMALLINT UNSIGNED"/>
-<variant type-name-pattern="SMALLINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="SMALLINT ZEROFILL"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fb9">
-<primary-key-description></primary-key-description>
-<primary-key-column name="uid"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FKD2C71F8845213B4D" on-delete="NO ACTION" on-update="NO ACTION" 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="3c59d3:1182f36109d:-7f96">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="root_message_uid" referenced-key-column-name="uid"/>
-</foreign-key>
-<foreign-key alias="" name="FKD2C71F88FE939F2A" on-delete="NO ACTION" on-update="NO ACTION" 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="3c59d3:1182f36109d:-7f95">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="message_uid" referenced-key-column-name="uid"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fb4" unique="false">
-<index-description></index-description>
-<index-column name="uid" sort="ASC"/>
-</index>
-<index alias="" name="FKD2C71F88FE939F2A" remarks="" uid="3c59d3:1182f36109d:-7fb3" unique="true">
-<index-description></index-description>
-<index-column name="message_uid" sort="ASC"/>
-</index>
-<index alias="" name="FKD2C71F8845213B4D" remarks="" uid="3c59d3:1182f36109d:-7fb2" unique="true">
-<index-description></index-description>
-<index-column name="root_message_uid" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="tl_lafrum11_report" remarks="" uid="3c59d3:1182f36109d:-7fb1">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="673" y="474"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="3c59d3:1182f36109d:-7faf">
-<column-description></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="65535" decimal-digits="0" default-value="" mandatory="false" name="comment" remarks="" uid="3c59d3:1182f36109d:-7fae">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="19" decimal-digits="0" default-value="" mandatory="false" name="release_date" remarks="" uid="3c59d3:1182f36109d:-7fad">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
-<variant type-name-pattern="DATETIME"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="11" decimal-digits="0" default-value="" mandatory="false" name="mark" remarks="" uid="3c59d3:1182f36109d:-7fac">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INT" selected-variant-pattern="INT(%n)">
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n)"/>
-<variant type-name-pattern="INT"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) ZEROFILL"/>
-<variant type-name-pattern="INT UNSIGNED"/>
-<variant type-name-pattern="INT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INT ZEROFILL"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fb0">
-<primary-key-description></primary-key-description>
-<primary-key-column name="uid"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list>
-<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fab" unique="false">
-<index-description></index-description>
-<index-column name="uid" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="tl_lafrum11_tool_session" remarks="" uid="3c59d3:1182f36109d:-7faa">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="595" y="11"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="3c59d3:1182f36109d:-7fa8">
-<column-description></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="19" decimal-digits="0" default-value="" mandatory="false" name="session_end_date" remarks="" uid="3c59d3:1182f36109d:-7fa7">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
-<variant type-name-pattern="DATETIME"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="19" decimal-digits="0" default-value="" mandatory="false" name="session_start_date" remarks="" uid="3c59d3:1182f36109d:-7fa6">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
-<variant type-name-pattern="DATETIME"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="11" decimal-digits="0" default-value="" mandatory="false" name="status" remarks="" uid="3c59d3:1182f36109d:-7fa5">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INT" selected-variant-pattern="INT(%n)">
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n)"/>
-<variant type-name-pattern="INT"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) ZEROFILL"/>
-<variant type-name-pattern="INT UNSIGNED"/>
-<variant type-name-pattern="INT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="forum_uid" remarks="" uid="3c59d3:1182f36109d:-7fa4">
-<column-description></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="false" name="session_id" remarks="" uid="3c59d3:1182f36109d:-7fa3">
-<column-description></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="250" decimal-digits="0" default-value="" mandatory="false" name="session_name" remarks="" uid="3c59d3:1182f36109d:-7fa2">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fa9">
-<primary-key-description></primary-key-description>
-<primary-key-column name="uid"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK5A04D7AE131CE31E" on-delete="NO ACTION" on-update="NO ACTION" 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="3c59d3:1182f36109d:-7f94">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="forum_uid" referenced-key-column-name="uid"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fa1" unique="false">
-<index-description></index-description>
-<index-column name="uid" sort="ASC"/>
-</index>
-<index alias="" name="FK5A04D7AE131CE31E" remarks="" uid="3c59d3:1182f36109d:-7fa0" unique="true">
-<index-description></index-description>
-<index-column name="forum_uid" sort="ASC"/>
-</index>
-</index-list>
-</table>
-</table-list>
-</schema>
-</schema-list>
-</database-model>
-</clay-model>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<clay-model clay-version="1.4.2">
+<database-model alias="" author="" begin-script="" end-script="" name="imscp" remarks="" sql-dialect-id="jp.azzurri.clay.dialect.MySQL_4_0_Dialect" uid="3c59d3:1182f36109d:-8000" version="1.0">
+<database-model-description/>
+<schema-list>
+<schema alias="" name="LAMS" remarks="" uid="3c59d3:1182f36109d:-7fff">
+<schema-description/>
+<domain-list/>
+<table-list/>
+</schema>
+<schema alias="" name="DEFAULT_SCHEMA" remarks="" uid="3c59d3:1182f36109d:-7ffe">
+<schema-description/>
+<domain-list/>
+<table-list>
+<table alias="" name="tl_lafrum11_attachment" remarks="" uid="3c59d3:1182f36109d:-7ffd">
+<table-description/>
+<table-figure-bounds height="-1" width="-1" x="107" y="375"/>
+<column-list>
+<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="3c59d3:1182f36109d:-7ffb">
+<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="false" name="file_version_id" remarks="" uid="3c59d3:1182f36109d:-7ffa">
+<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="255" decimal-digits="0" default-value="" mandatory="false" name="file_type" remarks="" uid="3c59d3:1182f36109d:-7ff9">
+<column-description/>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="file_name" remarks="" uid="3c59d3:1182f36109d:-7ff8">
+<column-description/>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="file_uuid" remarks="" uid="3c59d3:1182f36109d:-7ff7">
+<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="19" decimal-digits="0" default-value="" mandatory="false" name="create_date" remarks="" uid="3c59d3:1182f36109d:-7ff6">
+<column-description/>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
+<variant type-name-pattern="DATETIME"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="forum_uid" remarks="" uid="3c59d3:1182f36109d:-7ff5">
+<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="false" name="message_uid" remarks="" uid="3c59d3:1182f36109d:-7ff4">
+<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="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7ffc">
+<primary-key-description/>
+<primary-key-column name="uid"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list>
+<foreign-key alias="" name="FK389AD9A2131CE31E" on-delete="NO ACTION" on-update="NO ACTION" 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="3c59d3:1182f36109d:-7f9f">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="forum_uid" referenced-key-column-name="uid"/>
+</foreign-key>
+<foreign-key alias="" name="FK389AD9A2FE939F2A" on-delete="NO ACTION" on-update="NO ACTION" 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="3c59d3:1182f36109d:-7f9e">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="message_uid" referenced-key-column-name="uid"/>
+</foreign-key>
+</foreign-key-list>
+<index-list>
+<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7ff3" unique="false">
+<index-description/>
+<index-column name="uid" sort="ASC"/>
+</index>
+<index alias="" name="FK389AD9A2FE939F2A" remarks="" uid="3c59d3:1182f36109d:-7ff2" unique="true">
+<index-description/>
+<index-column name="message_uid" sort="ASC"/>
+</index>
+<index alias="" name="FK389AD9A2131CE31E" remarks="" uid="3c59d3:1182f36109d:-7ff1" unique="true">
+<index-description/>
+<index-column name="forum_uid" sort="ASC"/>
+</index>
+</index-list>
+</table>
+<table alias="" name="tl_lafrum11_forum" remarks="" uid="3c59d3:1182f36109d:-7ff0">
+<table-description/>
+<table-figure-bounds height="254" width="180" x="50" y="8"/>
+<column-list>
+<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="3c59d3:1182f36109d:-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="19" decimal-digits="0" default-value="" mandatory="false" name="create_date" remarks="" uid="3c59d3:1182f36109d:-7fed">
+<column-description/>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
+<variant type-name-pattern="DATETIME"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="19" decimal-digits="0" default-value="" mandatory="false" name="update_date" remarks="" uid="3c59d3:1182f36109d:-7fec">
+<column-description/>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
+<variant type-name-pattern="DATETIME"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="create_by" remarks="" uid="3c59d3:1182f36109d:-7feb">
+<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="255" decimal-digits="0" default-value="" mandatory="false" name="title" remarks="" uid="3c59d3:1182f36109d:-7fea">
+<column-description/>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="allow_anonym" remarks="" uid="3c59d3:1182f36109d:-7fe9">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="run_offline" remarks="" uid="3c59d3:1182f36109d:-7fe8">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="lock_on_finished" remarks="" uid="3c59d3:1182f36109d:-7fe7">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="instructions" remarks="" uid="3c59d3:1182f36109d:-7fe6">
+<column-description/>
+<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
+<variant type-name-pattern="TEXT"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="online_instructions" remarks="" uid="3c59d3:1182f36109d:-7fe5">
+<column-description/>
+<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
+<variant type-name-pattern="TEXT"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="offline_instructions" remarks="" uid="3c59d3:1182f36109d:-7fe4">
+<column-description/>
+<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
+<variant type-name-pattern="TEXT"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="content_in_use" remarks="" uid="3c59d3:1182f36109d:-7fe3">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="define_later" remarks="" uid="3c59d3:1182f36109d:-7fe2">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="content_id" remarks="" uid="3c59d3:1182f36109d:-7fe1">
+<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="1" decimal-digits="0" default-value="" mandatory="false" name="allow_edit" remarks="" uid="3c59d3:1182f36109d:-7fe0">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="allow_rich_editor" remarks="" uid="3c59d3:1182f36109d:-7fdf">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="false" name="mark_release_notify" remarks="" uid="42f3a9:11c2093dbc4:-7fee">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT">
+<variant type-name-pattern="TINYINT"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+</data-type>
+</column>
+</column-list>
+<primary-key alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fef">
+<primary-key-description/>
+<primary-key-column name="uid"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list/>
+<index-list>
+<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fde" unique="false">
+<index-description/>
+<index-column name="uid" sort="ASC"/>
+</index>
+<index alias="" name="content_id" remarks="" uid="3c59d3:1182f36109d:-7fdd" unique="false">
+<index-description/>
+<index-column name="content_id" sort="ASC"/>
+</index>
+</index-list>
+</table>
+<table alias="" name="tl_lafrum11_forum_user" remarks="" uid="3c59d3:1182f36109d:-7fdc">
+<table-description/>
+<table-figure-bounds height="-1" width="-1" x="336" y="175"/>
+<column-list>
+<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="3c59d3:1182f36109d:-7fda">
+<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="false" name="user_id" remarks="" uid="3c59d3:1182f36109d:-7fd9">
+<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="255" decimal-digits="0" default-value="" mandatory="false" name="last_name" remarks="" uid="3c59d3:1182f36109d:-7fd8">
+<column-description/>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="first_name" remarks="" uid="3c59d3:1182f36109d:-7fd7">
+<column-description/>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="session_id" remarks="" uid="3c59d3:1182f36109d:-7fd6">
+<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="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fdb">
+<primary-key-description/>
+<primary-key-column name="uid"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list>
+<foreign-key alias="" name="FK7B83A4A85F0116B6" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lafrum11_tool_session" 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="3c59d3:1182f36109d:-7f9d">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="session_id" referenced-key-column-name="uid"/>
+</foreign-key>
+</foreign-key-list>
+<index-list>
+<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fd5" unique="false">
+<index-description/>
+<index-column name="uid" sort="ASC"/>
+</index>
+<index alias="" name="FK7B83A4A85F0116B6" remarks="" uid="3c59d3:1182f36109d:-7fd4" unique="true">
+<index-description/>
+<index-column name="session_id" sort="ASC"/>
+</index>
+</index-list>
+</table>
+<table alias="" name="tl_lafrum11_message" remarks="" uid="3c59d3:1182f36109d:-7fd3">
+<table-description/>
+<table-figure-bounds height="-1" width="-1" x="377" y="324"/>
+<column-list>
+<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="3c59d3:1182f36109d:-7fd1">
+<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="19" decimal-digits="0" default-value="" mandatory="false" name="create_date" remarks="" uid="3c59d3:1182f36109d:-7fd0">
+<column-description/>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
+<variant type-name-pattern="DATETIME"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="19" decimal-digits="0" default-value="" mandatory="false" name="last_reply_date" remarks="" uid="3c59d3:1182f36109d:-7fcf">
+<column-description/>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
+<variant type-name-pattern="DATETIME"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="19" decimal-digits="0" default-value="" mandatory="false" name="update_date" remarks="" uid="3c59d3:1182f36109d:-7fce">
+<column-description/>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
+<variant type-name-pattern="DATETIME"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="create_by" remarks="" uid="3c59d3:1182f36109d:-7fcd">
+<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="false" name="modified_by" remarks="" uid="3c59d3:1182f36109d:-7fcc">
+<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="255" decimal-digits="0" default-value="" mandatory="false" name="subject" remarks="" uid="3c59d3:1182f36109d:-7fcb">
+<column-description/>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="body" remarks="" uid="3c59d3:1182f36109d:-7fca">
+<column-description/>
+<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
+<variant type-name-pattern="TEXT"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="is_authored" remarks="" uid="3c59d3:1182f36109d:-7fc9">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="is_anonymous" remarks="" uid="3c59d3:1182f36109d:-7fc8">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="forum_session_uid" remarks="" uid="3c59d3:1182f36109d:-7fc7">
+<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="false" name="parent_uid" remarks="" uid="3c59d3:1182f36109d:-7fc6">
+<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="false" name="forum_uid" remarks="" uid="3c59d3:1182f36109d:-7fc5">
+<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="11" decimal-digits="0" default-value="" mandatory="false" name="reply_number" remarks="" uid="3c59d3:1182f36109d:-7fc4">
+<column-description/>
+<data-type jdbc-type="4" name="INT" selected-variant-pattern="INT(%n)">
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n)"/>
+<variant type-name-pattern="INT"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) ZEROFILL"/>
+<variant type-name-pattern="INT UNSIGNED"/>
+<variant type-name-pattern="INT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="INT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="hide_flag" remarks="" uid="3c59d3:1182f36109d:-7fc3">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="report_id" remarks="" uid="3c59d3:1182f36109d:-7fc2">
+<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="false" name="authored_parent_uid" remarks="" uid="3c59d3:1182f36109d:-7f91">
+<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="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fd2">
+<primary-key-description/>
+<primary-key-column name="uid"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list>
+<foreign-key alias="" name="FK4A6067E8647A7264" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lafrum11_forum_user" 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="3c59d3:1182f36109d:-7f9c">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="modified_by" referenced-key-column-name="uid"/>
+</foreign-key>
+<foreign-key alias="" name="FK4A6067E8131CE31E" on-delete="NO ACTION" on-update="NO ACTION" 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="3c59d3:1182f36109d:-7f9b">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="forum_uid" referenced-key-column-name="uid"/>
+</foreign-key>
+<foreign-key alias="" name="FK4A6067E824089E4D" on-delete="NO ACTION" on-update="NO ACTION" 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="3c59d3:1182f36109d:-7f9a">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="parent_uid" referenced-key-column-name="uid"/>
+</foreign-key>
+<foreign-key alias="" name="FK4A6067E89357B45B" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lafrum11_tool_session" 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="3c59d3:1182f36109d:-7f99">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="forum_session_uid" referenced-key-column-name="uid"/>
+</foreign-key>
+<foreign-key alias="" name="FK4A6067E897F0DB46" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lafrum11_report" 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="3c59d3:1182f36109d:-7f98">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="report_id" referenced-key-column-name="uid"/>
+</foreign-key>
+<foreign-key alias="" name="FK4A6067E8E42F4351" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lafrum11_forum_user" 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="3c59d3:1182f36109d:-7f97">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="create_by" referenced-key-column-name="uid"/>
+</foreign-key>
+</foreign-key-list>
+<index-list>
+<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fc1" unique="false">
+<index-description/>
+<index-column name="uid" sort="ASC"/>
+</index>
+<index alias="" name="FK4A6067E8E42F4351" remarks="" uid="3c59d3:1182f36109d:-7fc0" unique="true">
+<index-description/>
+<index-column name="create_by" sort="ASC"/>
+</index>
+<index alias="" name="FK4A6067E897F0DB46" remarks="" uid="3c59d3:1182f36109d:-7fbf" unique="true">
+<index-description/>
+<index-column name="report_id" sort="ASC"/>
+</index>
+<index alias="" name="FK4A6067E8131CE31E" remarks="" uid="3c59d3:1182f36109d:-7fbe" unique="true">
+<index-description/>
+<index-column name="forum_uid" sort="ASC"/>
+</index>
+<index alias="" name="FK4A6067E824089E4D" remarks="" uid="3c59d3:1182f36109d:-7fbd" unique="true">
+<index-description/>
+<index-column name="parent_uid" sort="ASC"/>
+</index>
+<index alias="" name="FK4A6067E89357B45B" remarks="" uid="3c59d3:1182f36109d:-7fbc" unique="true">
+<index-description/>
+<index-column name="forum_session_uid" sort="ASC"/>
+</index>
+<index alias="" name="FK4A6067E8647A7264" remarks="" uid="3c59d3:1182f36109d:-7fbb" unique="true">
+<index-description/>
+<index-column name="modified_by" sort="ASC"/>
+</index>
+<index alias="" name="IX_msg_auth_parent" remarks="" uid="3c59d3:1182f36109d:-7f8e" unique="false">
+<index-description/>
+<index-column name="authored_parent_uid" sort="ASC"/>
+</index>
+</index-list>
+</table>
+<table alias="" name="tl_lafrum11_message_seq" remarks="" uid="3c59d3:1182f36109d:-7fba">
+<table-description/>
+<table-figure-bounds height="-1" width="-1" x="689" y="313"/>
+<column-list>
+<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="3c59d3:1182f36109d:-7fb8">
+<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="false" name="root_message_uid" remarks="" uid="3c59d3:1182f36109d:-7fb7">
+<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="false" name="message_uid" remarks="" uid="3c59d3:1182f36109d:-7fb6">
+<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="6" decimal-digits="0" default-value="" mandatory="false" name="message_level" remarks="" uid="3c59d3:1182f36109d:-7fb5">
+<column-description/>
+<data-type jdbc-type="5" name="SMALLINT" selected-variant-pattern="SMALLINT(%n)">
+<variant precision-max="5" precision-min="0" precision-variable="%n" type-name-pattern="SMALLINT(%n)"/>
+<variant type-name-pattern="SMALLINT"/>
+<variant precision-max="5" precision-min="0" precision-variable="%n" type-name-pattern="SMALLINT(%n) UNSIGNED"/>
+<variant precision-max="5" precision-min="0" precision-variable="%n" type-name-pattern="SMALLINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="5" precision-min="0" precision-variable="%n" type-name-pattern="SMALLINT(%n) ZEROFILL"/>
+<variant type-name-pattern="SMALLINT UNSIGNED"/>
+<variant type-name-pattern="SMALLINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="SMALLINT ZEROFILL"/>
+</data-type>
+</column>
+</column-list>
+<primary-key alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fb9">
+<primary-key-description/>
+<primary-key-column name="uid"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list>
+<foreign-key alias="" name="FKD2C71F8845213B4D" on-delete="NO ACTION" on-update="NO ACTION" 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="3c59d3:1182f36109d:-7f96">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="root_message_uid" referenced-key-column-name="uid"/>
+</foreign-key>
+<foreign-key alias="" name="FKD2C71F88FE939F2A" on-delete="NO ACTION" on-update="NO ACTION" 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="3c59d3:1182f36109d:-7f95">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="message_uid" referenced-key-column-name="uid"/>
+</foreign-key>
+</foreign-key-list>
+<index-list>
+<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fb4" unique="false">
+<index-description/>
+<index-column name="uid" sort="ASC"/>
+</index>
+<index alias="" name="FKD2C71F88FE939F2A" remarks="" uid="3c59d3:1182f36109d:-7fb3" unique="true">
+<index-description/>
+<index-column name="message_uid" sort="ASC"/>
+</index>
+<index alias="" name="FKD2C71F8845213B4D" remarks="" uid="3c59d3:1182f36109d:-7fb2" unique="true">
+<index-description/>
+<index-column name="root_message_uid" sort="ASC"/>
+</index>
+</index-list>
+</table>
+<table alias="" name="tl_lafrum11_report" remarks="" uid="3c59d3:1182f36109d:-7fb1">
+<table-description/>
+<table-figure-bounds height="-1" width="-1" x="673" y="474"/>
+<column-list>
+<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="3c59d3:1182f36109d:-7faf">
+<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="65535" decimal-digits="0" default-value="" mandatory="false" name="comment" remarks="" uid="3c59d3:1182f36109d:-7fae">
+<column-description/>
+<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
+<variant type-name-pattern="TEXT"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="19" decimal-digits="0" default-value="" mandatory="false" name="release_date" remarks="" uid="3c59d3:1182f36109d:-7fad">
+<column-description/>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
+<variant type-name-pattern="DATETIME"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="11" decimal-digits="0" default-value="" mandatory="false" name="mark" remarks="" uid="3c59d3:1182f36109d:-7fac">
+<column-description/>
+<data-type jdbc-type="4" name="INT" selected-variant-pattern="INT(%n)">
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n)"/>
+<variant type-name-pattern="INT"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) ZEROFILL"/>
+<variant type-name-pattern="INT UNSIGNED"/>
+<variant type-name-pattern="INT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="INT ZEROFILL"/>
+</data-type>
+</column>
+</column-list>
+<primary-key alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fb0">
+<primary-key-description/>
+<primary-key-column name="uid"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list/>
+<index-list>
+<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fab" unique="false">
+<index-description/>
+<index-column name="uid" sort="ASC"/>
+</index>
+</index-list>
+</table>
+<table alias="" name="tl_lafrum11_tool_session" remarks="" uid="3c59d3:1182f36109d:-7faa">
+<table-description/>
+<table-figure-bounds height="-1" width="-1" x="595" y="11"/>
+<column-list>
+<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="" uid="3c59d3:1182f36109d:-7fa8">
+<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="19" decimal-digits="0" default-value="" mandatory="false" name="session_end_date" remarks="" uid="3c59d3:1182f36109d:-7fa7">
+<column-description/>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
+<variant type-name-pattern="DATETIME"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="19" decimal-digits="0" default-value="" mandatory="false" name="session_start_date" remarks="" uid="3c59d3:1182f36109d:-7fa6">
+<column-description/>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
+<variant type-name-pattern="DATETIME"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="11" decimal-digits="0" default-value="" mandatory="false" name="status" remarks="" uid="3c59d3:1182f36109d:-7fa5">
+<column-description/>
+<data-type jdbc-type="4" name="INT" selected-variant-pattern="INT(%n)">
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n)"/>
+<variant type-name-pattern="INT"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) ZEROFILL"/>
+<variant type-name-pattern="INT UNSIGNED"/>
+<variant type-name-pattern="INT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="INT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="forum_uid" remarks="" uid="3c59d3:1182f36109d:-7fa4">
+<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="false" name="session_id" remarks="" uid="3c59d3:1182f36109d:-7fa3">
+<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="250" decimal-digits="0" default-value="" mandatory="false" name="session_name" remarks="" uid="3c59d3:1182f36109d:-7fa2">
+<column-description/>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+</column-list>
+<primary-key alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fa9">
+<primary-key-description/>
+<primary-key-column name="uid"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list>
+<foreign-key alias="" name="FK5A04D7AE131CE31E" on-delete="NO ACTION" on-update="NO ACTION" 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="3c59d3:1182f36109d:-7f94">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="forum_uid" referenced-key-column-name="uid"/>
+</foreign-key>
+</foreign-key-list>
+<index-list>
+<index alias="" name="PRIMARY" remarks="" uid="3c59d3:1182f36109d:-7fa1" unique="false">
+<index-description/>
+<index-column name="uid" sort="ASC"/>
+</index>
+<index alias="" name="FK5A04D7AE131CE31E" remarks="" uid="3c59d3:1182f36109d:-7fa0" unique="true">
+<index-description/>
+<index-column name="forum_uid" sort="ASC"/>
+</index>
+</index-list>
+</table>
+</table-list>
+</schema>
+</schema-list>
+</database-model>
+</clay-model>
Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql
===================================================================
diff -u -r5cf94a873af22670c1bcfb832c7e868ef168333a -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision 5cf94a873af22670c1bcfb832c7e868ef168333a)
+++ lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -44,6 +44,7 @@
    limited_input_flag smallint,
    reflect_instructions varchar(255),
    reflect_on_activity smallint, 
+   mark_release_notify tinyint DEFAULT 0,
    primary key (uid)
 )TYPE=InnoDB;
 create table tl_lafrum11_forum_user (
Index: lams_tool_forum/db/sql/table-schema.sql
===================================================================
diff -u -r4526bc668178760326017e561b75a0358e10b4fb -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 4526bc668178760326017e561b75a0358e10b4fb)
+++ lams_tool_forum/db/sql/table-schema.sql	(.../table-schema.sql)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -19,7 +19,7 @@
 drop table if exists tl_lafrum11_report;
 drop table if exists tl_lafrum11_tool_session;
 create table tl_lafrum11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, forum_uid bigint, message_uid bigint, primary key (uid));
-create table tl_lafrum11_forum (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), allow_anonym bit, run_offline bit, lock_on_finished bit, instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_edit bit, allow_rich_editor bit, limited_of_chars integer, limited_input_flag bit, allow_new_topic bit, allow_upload bit, maximum_reply integer, minimum_reply integer, reflect_instructions varchar(255), reflect_on_activity bit, primary key (uid));
+create table tl_lafrum11_forum (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), allow_anonym bit, run_offline bit, lock_on_finished bit, instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_edit bit, allow_rich_editor bit, limited_of_chars integer, limited_input_flag bit, allow_new_topic bit, allow_upload bit, maximum_reply integer, minimum_reply integer, reflect_instructions varchar(255), reflect_on_activity bit, mark_release_notify tinyint DEFAULT 0,primary key (uid));
 create table tl_lafrum11_forum_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), session_id bigint, login_name varchar(255), session_finished bit, primary key (uid));
 create table tl_lafrum11_message (uid bigint not null auto_increment, create_date datetime, last_reply_date datetime, update_date datetime, create_by bigint, modified_by bigint, subject varchar(255), body text, is_authored bit, is_anonymous bit, forum_session_uid bigint, parent_uid bigint, forum_uid bigint, reply_number integer, hide_flag bit, report_id bigint, primary key (uid));
 create table tl_lafrum11_message_seq (uid bigint not null auto_increment, root_message_uid bigint, message_uid bigint, message_level smallint, primary key (uid));
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
diff -u -rb318437288a6761c6e176c89974773e231bfbc87 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision b318437288a6761c6e176c89974773e231bfbc87)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -112,6 +112,7 @@
    		<property name="messageService"><ref bean="forumMessageService"/></property>
   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
   		<property name="forumOutputFactory"><ref local="forumOutputFactory"/></property>
+  		<property name="eventNotificationService"><ref bean="eventNotificationService"/></property> 
     </bean>
 
     <bean id="forumService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -r77e263b43c7aed360e8dcc46af273db55123bc83 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 77e263b43c7aed360e8dcc46af273db55123bc83)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -252,6 +252,14 @@
             column="reflect_on_activity"
         />
 
+        <property
+            name="notifyLearnersOnMarkRelease"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="mark_release_notify"
+        />
+
         <!--
             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 -r0967b90c85b0c7e90e3937068c82fb944bf4ccf7 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision 0967b90c85b0c7e90e3937068c82fb944bf4ccf7)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -21,7 +21,7 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.forum.persistence;
 
 import java.util.Date;
@@ -32,9 +32,6 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.contentrepository.ItemNotFoundException;
-import org.lamsfoundation.lams.contentrepository.NodeKey;
-import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.tool.forum.util.ForumToolContentHandler;
 
 /**
@@ -44,118 +41,141 @@
  * @hibernate.class  table="tl_lafrum11_forum"
  *
  */
-public class Forum implements Cloneable{
-	
+public class Forum implements Cloneable {
+
 	private static final Logger log = Logger.getLogger(Forum.class);
-	
+
 	//key 
 	private Long uid;
+
 	//tool contentID
 	private Long contentId;
+
 	private String title;
+
 	private boolean lockWhenFinished;
+
 	private boolean runOffline;
+
 	private boolean allowAnonym;
+
 	private boolean allowEdit;
+
 	private boolean allowNewTopic;
+
 	private boolean allowUpload;
+
 	private int maximumReply;
+
 	private int minimumReply;
-	
+
 	private boolean allowRichEditor;
+
 	private String instructions;
+
 	private String onlineInstructions;
+
 	private String offlineInstructions;
+
 	private boolean defineLater;
+
 	private boolean contentInUse;
+
 	private Date created;
+
 	private Date updated;
+
 	private ForumUser createdBy;
-	
+
 	private Set messages;
+
 	private Set attachments;
+
 	private int limitedChar;
-    private boolean limitedInput;
-    
+
+	private boolean limitedInput;
+
 	private boolean reflectOnActivity;
+
 	private String reflectInstructions;
 
-    //********* Non Persist fields
+	private boolean notifyLearnersOnMarkRelease;
+
+	//********* Non Persist fields
 	private ForumToolContentHandler toolContentHandler;
-    
+
 	/**
 	 * Default contruction method. 
 	 *
 	 */
-  	public Forum(){
-  		attachments = new HashSet();
-  		messages = new HashSet();
-  	}
-//  **********************************************************
-  	//		Function method for Forum
-//  **********************************************************
-  	public Object clone(){
-  		
-  		Forum forum = null;
-  		try{
-  			forum = (Forum) super.clone();
-  			forum.setUid(null);
-  			//clone message
-  			if(messages != null){
+	public Forum() {
+		attachments = new HashSet();
+		messages = new HashSet();
+	}
+
+	//  **********************************************************
+	//		Function method for Forum
+	//  **********************************************************
+	@Override
+	public Object clone() {
+
+		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));
+				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
- 
+			}
+			//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
+
 					set.add(newFile);
-  				}
-  				forum.attachments = set;
-  			}
-		} catch (CloneNotSupportedException e) {
-			log.error("When clone " + Forum.class + " failed");
+				}
+				forum.attachments = set;
+			}
 		}
-  		
-  		return forum;
-  	}
+		catch (CloneNotSupportedException e) {
+			Forum.log.error("When clone " + Forum.class + " failed");
+		}
+
+		return forum;
+	}
+
+	@Override
 	public boolean equals(Object o) {
-		if (this == o)
+		if (this == o) {
 			return true;
-		if (!(o instanceof Forum))
+		}
+		if (!(o instanceof Forum)) {
 			return false;
+		}
 
 		final Forum genericEntity = (Forum) o;
 
-      	return new EqualsBuilder()
-      	.append(this.uid,genericEntity.uid)
-      	.append(this.title,genericEntity.title)
-      	.append(this.instructions,genericEntity.instructions)
-      	.append(this.onlineInstructions,genericEntity.onlineInstructions)
-      	.append(this.offlineInstructions,genericEntity.offlineInstructions)
-      	.append(this.created,genericEntity.created)
-      	.append(this.updated,genericEntity.updated)
-      	.append(this.createdBy,genericEntity.createdBy)
-      	.isEquals();
+		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();
 	}
 
+	@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 new HashCodeBuilder().append(uid).append(title).append(instructions).append(onlineInstructions).append(
+				offlineInstructions).append(created).append(updated).append(createdBy).toHashCode();
 	}
-	
+
 	//**********************************************************
 	// get/set methods
 	//**********************************************************
@@ -166,7 +186,7 @@
 	 * @hibernate.property column="create_date"
 	 */
 	public Date getCreated() {
-      return created;
+		return created;
 	}
 
 	/**
@@ -175,7 +195,7 @@
 	 * @param created
 	 */
 	public void setCreated(Date created) {
-	    this.created = created;
+		this.created = created;
 	}
 
 	/**
@@ -185,7 +205,7 @@
 	 * @hibernate.property column="update_date"
 	 */
 	public Date getUpdated() {
-        return updated;
+		return updated;
 	}
 
 	/**
@@ -194,31 +214,31 @@
 	 * @param updated
 	 */
 	public void setUpdated(Date updated) {
-        this.updated = updated;
+		this.updated = updated;
 	}
 
-    /**
-     * @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 userid of the user who created the Forum.
+	 *
+	 * @hibernate.many-to-one
+	 *      cascade="none"
+	 * 		column="create_by"
+	 *
+	 */
+	public ForumUser getCreatedBy() {
+		return createdBy;
+	}
 
-    /**
-     * @param createdBy The userid of the user who created this Forum.
-     */
-    public void setCreatedBy(ForumUser createdBy) {
-        this.createdBy = createdBy;
-    }
+	/**
+	 * @param createdBy The userid of the user who created this Forum.
+	 */
+	public void setCreatedBy(ForumUser createdBy) {
+		this.createdBy = createdBy;
+	}
 
-    /**
-     * @hibernate.id column="uid" generator-class="native"
-     */
+	/**
+	 * @hibernate.id column="uid" generator-class="native"
+	 */
 	public Long getUid() {
 		return uid;
 	}
@@ -255,13 +275,13 @@
 	public boolean getAllowAnonym() {
 		return allowAnonym;
 	}
-	
+
 	/**
 	 * @param allowAnonym The allowAnonym to set.
 	 *
 	 */
 	public void setAllowAnonym(boolean allowAnnomity) {
-		this.allowAnonym = allowAnnomity;
+		allowAnonym = allowAnnomity;
 	}
 
 	/**
@@ -274,99 +294,99 @@
 	public boolean getRunOffline() {
 		return runOffline;
 	}
-    
+
 	/**
 	 * @param runOffline The forceOffLine to set.
 	 *
 	 *
 	 */
 	public void setRunOffline(boolean forceOffline) {
-		this.runOffline = forceOffline;
+		runOffline = forceOffline;
 	}
 
-    /**
-     * @return Returns the lockWhenFinish.
-     *
-     * @hibernate.property
-     * 		column="lock_on_finished"
-     *
-     */
-    public boolean getLockWhenFinished() {
-        return lockWhenFinished;
-    }
+	/**
+	 * @return Returns the lockWhenFinish.
+	 *
+	 * @hibernate.property
+	 * 		column="lock_on_finished"
+	 *
+	 */
+	public boolean getLockWhenFinished() {
+		return lockWhenFinished;
+	}
 
-    /**
-     * @param lockWhenFinished Set to true to lock the forum for finished users.
-     */
-    public void setLockWhenFinished(boolean lockWhenFinished) {
-        this.lockWhenFinished = lockWhenFinished;
-    }
+	/**
+	 * @param lockWhenFinished Set to true to lock the forum for finished users.
+	 */
+	public void setLockWhenFinished(boolean lockWhenFinished) {
+		this.lockWhenFinished = lockWhenFinished;
+	}
 
-    /**
-     * @return Returns the instructions set by the teacher.
-     *
-     * @hibernate.property
-     * 		column="instructions"
-     *      type="text"
-     */
-    public String getInstructions() {
-        return instructions;
-    }
+	/**
+	 * @return Returns the instructions set by the teacher.
+	 *
+	 * @hibernate.property
+	 * 		column="instructions"
+	 *      type="text"
+	 */
+	public String getInstructions() {
+		return instructions;
+	}
 
-    public void setInstructions(String instructions) {
-        this.instructions = instructions;
-    }
+	public void setInstructions(String instructions) {
+		this.instructions = instructions;
+	}
 
-    /**
-     * @return Returns the onlineInstructions set by the teacher.
-     *
-     * @hibernate.property
-     * 		column="online_instructions"
-     *      type="text"
-     */
-    public String getOnlineInstructions() {
-        return onlineInstructions;
-    }
+	/**
+	 * @return Returns the onlineInstructions set by the teacher.
+	 *
+	 * @hibernate.property
+	 * 		column="online_instructions"
+	 *      type="text"
+	 */
+	public String getOnlineInstructions() {
+		return onlineInstructions;
+	}
 
-    public void setOnlineInstructions(String onlineInstructions) {
-        this.onlineInstructions = onlineInstructions;
-    }
+	public void setOnlineInstructions(String onlineInstructions) {
+		this.onlineInstructions = onlineInstructions;
+	}
 
-    /**
-     * @return Returns the onlineInstructions set by the teacher.
-     *
-     * @hibernate.property
-     * 		column="offline_instructions"
-     *      type="text"
-     */
-    public String getOfflineInstructions() {
-        return offlineInstructions;
-    }
+	/**
+	 * @return Returns the onlineInstructions set by the teacher.
+	 *
+	 * @hibernate.property
+	 * 		column="offline_instructions"
+	 *      type="text"
+	 */
+	public String getOfflineInstructions() {
+		return offlineInstructions;
+	}
 
-    public void setOfflineInstructions(String offlineInstructions) {
-        this.offlineInstructions = offlineInstructions;
-    }
+	public void setOfflineInstructions(String offlineInstructions) {
+		this.offlineInstructions = offlineInstructions;
+	}
 
 	/**
-     *
-     * @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.
-     */
+	 *
+	 * @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;
 	}
 
-    /*
+	/*
 	 * @param attachments The attachments to set.
-     */
-    public void setAttachments(Set attachments) {
+	 */
+	public void setAttachments(Set attachments) {
 		this.attachments = attachments;
 	}
 
@@ -386,6 +406,7 @@
 	public Set getMessages() {
 		return messages;
 	}
+
 	public void setMessages(Set messages) {
 		this.messages = messages;
 	}
@@ -394,10 +415,10 @@
 	 * Updates the modification data for this entity.
 	 */
 	public void updateModificationData() {
-	
+
 		long now = System.currentTimeMillis();
 		if (created == null) {
-			this.setCreated (new Date(now));
+			this.setCreated(new Date(now));
 		}
 		this.setUpdated(new Date(now));
 	}
@@ -413,6 +434,7 @@
 	public void setContentInUse(boolean contentInUse) {
 		this.contentInUse = contentInUse;
 	}
+
 	/**
 	 * @hibernate.property column="define_later"
 	 * @return
@@ -424,6 +446,7 @@
 	public void setDefineLater(boolean defineLater) {
 		this.defineLater = defineLater;
 	}
+
 	/**
 	 * @hibernate.property column="content_id" unique="true" 
 	 * @return
@@ -443,111 +466,144 @@
 	public boolean isAllowEdit() {
 		return allowEdit;
 	}
+
 	public void setAllowEdit(boolean allowEdit) {
 		this.allowEdit = allowEdit;
 	}
+
 	/**
 	 * @hibernate.property column="allow_rich_editor"
 	 * @return
 	 */
 	public boolean isAllowRichEditor() {
 		return allowRichEditor;
 	}
+
 	public void setAllowRichEditor(boolean allowRichEditor) {
 		this.allowRichEditor = allowRichEditor;
 	}
-	
-	public static Forum newInstance(Forum fromContent, Long contentId, ForumToolContentHandler forumToolContentHandler){
+
+	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;
 	}
+
 	/**
 	 * @hibernate.property column="limited_of_chars"
 	 * @return
 	 */
 	public int getLimitedChar() {
 		return limitedChar;
 	}
+
 	public void setLimitedChar(int limitedChar) {
 		this.limitedChar = limitedChar;
 	}
+
 	/**
 	 * @hibernate.property column="limited_input_flag"
 	 * @return
 	 */
 	public boolean isLimitedInput() {
 		return limitedInput;
 	}
+
 	public void setLimitedInput(boolean limitedInput) {
 		this.limitedInput = limitedInput;
 	}
+
 	public ForumToolContentHandler getToolContentHandler() {
 		return toolContentHandler;
 	}
+
 	public void setToolContentHandler(ForumToolContentHandler toolContentHandler) {
 		this.toolContentHandler = toolContentHandler;
 	}
+
 	/**
 	 * @hibernate.property column="allow_new_topic"
 	 * @return
-	 */	
+	 */
 	public boolean isAllowNewTopic() {
 		return allowNewTopic;
 	}
+
 	public void setAllowNewTopic(boolean allowNewTopic) {
 		this.allowNewTopic = allowNewTopic;
 	}
+
 	/**
 	 * @hibernate.property column="allow_upload"
 	 * @return
 	 */
 	public boolean isAllowUpload() {
 		return allowUpload;
 	}
+
 	public void setAllowUpload(boolean allowUpload) {
 		this.allowUpload = allowUpload;
 	}
+
 	/**
 	 * @hibernate.property column="maximum_reply"
 	 * @return
-	 */	
+	 */
 	public int getMaximumReply() {
 		return maximumReply;
 	}
+
 	public void setMaximumReply(int maximumReply) {
 		this.maximumReply = maximumReply;
 	}
+
 	/**
 	 * @hibernate.property column="minimum_reply"
 	 * @return
-	 */	
+	 */
 	public int getMinimumReply() {
 		return minimumReply;
 	}
+
 	public void setMinimumReply(int minimumReply) {
 		this.minimumReply = minimumReply;
 	}
+
 	/**
 	 * @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;
+	}
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r9c9add3bbbf1e2925117aa727f4be43f2959b465 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 9c9add3bbbf1e2925117aa727f4be43f2959b465)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -21,11 +21,9 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.forum.service;
 
-import static org.lamsfoundation.lams.tool.forum.util.ForumConstants.OLD_FORUM_STYLE;
-
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -55,6 +53,7 @@
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
 import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
+import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
@@ -107,223 +106,242 @@
  * 
  * @version $Revision$
  */
-public class ForumService implements IForumService,ToolContentManager,ToolSessionManager,ToolContentImport102Manager {
+public class ForumService implements IForumService, ToolContentManager, ToolSessionManager, ToolContentImport102Manager {
 	private static final Logger log = Logger.getLogger(ForumService.class);
+
 	//DAO variables
 	private ForumDao forumDao;
+
 	private AttachmentDao attachmentDao;
+
 	private MessageDao messageDao;
+
 	private MessageSeqDao messageSeqDao;
+
 	private ForumUserDao forumUserDao;
+
 	private ForumToolSessionDao forumToolSessionDao;
+
 	private ForumReportDAO forumReportDAO;
+
 	//system level handler and service 
 	private ILamsToolService toolService;
+
 	private ForumToolContentHandler forumToolContentHandler;
+
 	private IRepositoryService repositoryService;
+
 	private ILearnerService learnerService;
+
 	private IAuditService auditService;
-    private MessageService messageService;
-    private IExportToolContentService exportContentService;
-    private IUserManagementService userManagementService;
+
+	private MessageService messageService;
+
+	private IExportToolContentService exportContentService;
+
+	private IUserManagementService userManagementService;
+
 	private ICoreNotebookService coreNotebookService;
+
 	private ForumOutputFactory forumOutputFactory;
-	
+
+	private IEventNotificationService eventNotificationService;
+
 	//---------------------------------------------------------------------
-    // Inversion of Control Methods - Method injection
-    //---------------------------------------------------------------------
+	// Inversion of Control Methods - Method injection
+	//---------------------------------------------------------------------
 	public void setAuditService(IAuditService auditService) {
 		this.auditService = auditService;
 	}
 
-	public IAuditService getAuditService( ) {
+	public IAuditService getAuditService() {
 		return auditService;
 	}
 
 	public void setMessageService(MessageService messageService) {
 		this.messageService = messageService;
 	}
-	
+
 	public ForumOutputFactory getForumOutputFactory() {
 		return forumOutputFactory;
 	}
 
-	public void setForumOutputFactory(
-			ForumOutputFactory forumOutputFactory) {
+	public void setForumOutputFactory(ForumOutputFactory forumOutputFactory) {
 		this.forumOutputFactory = forumOutputFactory;
 	}
 
 	public Forum updateForum(Forum forum) throws PersistenceException {
-        forumDao.saveOrUpdate(forum);
-        return forum;
-    }
+		forumDao.saveOrUpdate(forum);
+		return forum;
+	}
 
-    public Forum getForum(Long forumUid) throws PersistenceException {
-        return (Forum) forumDao.getById(forumUid);
-    }
+	public Forum getForum(Long forumUid) throws PersistenceException {
+		return forumDao.getById(forumUid);
+	}
 
-	public Forum getForumByContentId(Long contentID)  throws PersistenceException {    	
-		return (Forum) forumDao.getByContentId(contentID);
+	public Forum getForumByContentId(Long contentID) throws PersistenceException {
+		return forumDao.getByContentId(contentID);
 	}
 
-    public void deleteForumAttachment(Long attachmentId) throws PersistenceException {
-        Attachment attachment = (Attachment) attachmentDao.getById(attachmentId);
-        attachmentDao.delete(attachment);
-    }
+	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, 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);
-    	}
-    	
-    	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);
-    	}
-        
-        // 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 {
-    	 
-    	 //update message
-    	messageDao.saveOrUpdate(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);
-        
-        return message;
-    }
+		//create message in database
+		messageDao.saveOrUpdate(message);
 
- 	public void updateReport(ForumReport report) {
- 		forumReportDAO.saveObject(report);
- 	}
-    public Message updateMessageHideFlag(Long messageId, boolean hideFlag) {
-    	
-    	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());
+		return message;
+	}
+
+	public Message updateTopic(Message message) throws PersistenceException {
+
+		//update message
+		messageDao.saveOrUpdate(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);
+
+		return message;
+	}
+
+	public void updateReport(ForumReport report) {
+		forumReportDAO.saveObject(report);
+	}
+
+	public Message updateMessageHideFlag(Long messageId, boolean hideFlag) {
+
+		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());
+			}
 
-	    	message.setHideFlag(hideFlag);
-	    	
-	    	// update message
-	    	messageDao.update(message);
-    	}
-    	return message;
-     }
+			message.setHideFlag(hideFlag);
 
-    public Message getMessage(Long messageUid) throws PersistenceException {
-        return (Message) messageDao.getById(messageUid);
-    }
+			// update message
+			messageDao.update(message);
+		}
+		return message;
+	}
 
-    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);
-     }
+	public Message getMessage(Long messageUid) throws PersistenceException {
+		return messageDao.getById(messageUid);
+	}
 
-    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);
-        
-        //get root topic and create record in MessageSeq table
-        MessageSeq parentSeq = messageSeqDao.getByTopicId(parent.getUid());
-        if(parentSeq == null){
-        	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 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);
+	}
 
-	public Attachment uploadInstructionFile(FormFile uploadFile, String fileType) throws PersistenceException{
-		if(uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName()))
+	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);
+
+		//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);
-		
+		}
+
 		//upload file to repository
-		NodeKey nodeKey = processFile(uploadFile,fileType);
-		
+		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());
-		
+
 		return file;
 
 	}
- 
+
 	/**
 	 * This method deletes the content with the given <code>uuid</code> and
 	 * <code>versionID</code> from the content repository
@@ -334,140 +352,139 @@
 	 *            The <code>version_id</code> of the node to be deleted.
 	 * @throws SubmitFilesException
 	 */
-	public void deleteFromRepository(Long uuid, Long versionID)
-			throws ForumException {
+	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());
+			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()))
+		if (uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName())) {
 			throw new ForumException("Could not find upload file: " + uploadFile);
-		
-		NodeKey nodeKey = processFile(uploadFile,IToolContentHandler.TYPE_ONLINE);
+		}
+
+		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;
 	}
-	public List getTopicThread(Long rootTopicId){
-		
-		List unsortedThread =  messageSeqDao.getTopicThread(rootTopicId);
+
+	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()){
+		SortedMap<MessageSeq, Message> map = new TreeMap<MessageSeq, Message>(new TopicComparator());
+		while (iter.hasNext()) {
 			msgSeq = (MessageSeq) iter.next();
-			map.put(msgSeq,msgSeq.getMessage());
+			map.put(msgSeq, msgSeq.getMessage());
 		}
-		return 	getSortedMessageDTO(map);
+		return getSortedMessageDTO(map);
 	}
 
-
-	public List getRootTopics(Long sessionId){
-		List topicsBySession =  messageDao.getRootTopics(sessionId);
+	public List getRootTopics(Long sessionId) {
+		List topicsBySession = messageDao.getRootTopics(sessionId);
 		ForumToolSession session = getSessionBySessionId(sessionId);
-		if(session == null || session.getForum() == null){
-			log.error("Failed on getting session by given sessionID:" + 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());
+		SortedMap<Date, Message> map = new TreeMap<Date, Message>(new DateComparator());
 		Iterator iter = topicsBySession.iterator();
-		while(iter.hasNext()){
+		while (iter.hasNext()) {
 			msg = (Message) iter.next();
-			if(OLD_FORUM_STYLE)
-				map.put(msg.getCreated(),msg);
-			else
-				map.put(msg.getLastReplyDate(),msg);
+			if (ForumConstants.OLD_FORUM_STYLE) {
+				map.put(msg.getCreated(), msg);
+			}
+			else {
+				map.put(msg.getLastReplyDate(), msg);
+			}
 		}
-		return 	MessageDTO.getMessageDTO(new ArrayList<Message>(map.values()));
-		
+		return MessageDTO.getMessageDTO(new ArrayList<Message>(map.values()));
+
 	}
 
 	public int getTopicsNum(Long userID, Long sessionId) {
-		return messageDao.getTopicsNum(userID,sessionId);
+		return messageDao.getTopicsNum(userID, sessionId);
 	}
-	
+
 	public int getNumOfPostsByTopic(Long userId, Long topicId) {
 		return messageSeqDao.getNumOfPostsByTopic(userId, topicId);
 	}
 
 	public ForumUser getUserByID(Long userId) {
-		return  forumUserDao.getByUserId(userId);
+		return forumUserDao.getByUserId(userId);
 	}
 
-	public ForumUser getUserByUserAndSession(Long userId,Long sessionId) {
-		return  forumUserDao.getByUserIdAndSessionId(userId,sessionId);
+	public ForumUser getUserByUserAndSession(Long userId, Long sessionId) {
+		return forumUserDao.getByUserIdAndSessionId(userId, sessionId);
 	}
 
 	public void createUser(ForumUser forumUser) {
 		forumUserDao.save(forumUser);
 	}
+
 	public ForumToolSession getSessionBySessionId(Long sessionId) {
 		return forumToolSessionDao.getBySessionId(sessionId);
 	}
 
 	public Long getRootTopicId(Long topicId) {
 		MessageSeq seq = messageSeqDao.getByTopicId(topicId);
-		if(seq == null ||seq.getRootMessage() == null){
-			log.error("A sequence information can not be found for topic ID:" + 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 List getAuthoredTopics(Long forumUid) {
 		List list = messageDao.getTopicsFromAuthor(forumUid);
-		
-		TreeMap<Date,Message> map = new TreeMap<Date,Message>(new DateComparator());
+
+		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()){
+		while (iter.hasNext()) {
 			Message topic = (Message) iter.next();
-			if ( topic.getToolSession() == null ) 
-				map.put(topic.getCreated(),topic);
+			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";
-    	    log.error(error);
-    	    throw new ForumException(error);
-    	}
-	    return contentId;
-    }
-
 	public List getSessionsByContentId(Long contentID) {
 		return forumToolSessionDao.getByContentId(contentID);
 	}
 
 	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);
 	}
 
@@ -479,38 +496,71 @@
 		//udate release mark date for each message.
 		List list = messageDao.getBySession(sessionID);
 		Iterator iter = list.iterator();
-		while(iter.hasNext()){
+		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];
+		}
+
+		while (iter.hasNext()) {
 			Message msg = (Message) iter.next();
 			ForumReport report = msg.getReport();
-			if(report != null)
+			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.
-		ForumToolSession session = forumToolSessionDao.getBySessionId(sessionID);
 		session.setMarkReleased(true);
 		forumToolSessionDao.saveOrUpdate(session);
-		
+
 	}
 
 	public void finishUserSession(ForumUser currentUser) {
 		currentUser.setSessionFinished(true);
 		forumUserDao.save(currentUser);
 	}
-	
-    //***************************************************************************************************************
-    // Private methods
-    //***************************************************************************************************************
+
+	//***************************************************************************************************************
+	// Private methods
+	//***************************************************************************************************************
 	/**
 	 * @param map
 	 * @return
 	 */
-	private List getSortedMessageDTO(SortedMap<MessageSeq,Message> map) {
+	private List getSortedMessageDTO(SortedMap<MessageSeq, Message> map) {
 		Iterator iter;
 		MessageSeq msgSeq;
 		List<MessageDTO> msgDtoList = new ArrayList<MessageDTO>();
-		iter =map.entrySet().iterator();
-		while(iter.hasNext()){
+		iter = map.entrySet().iterator();
+		while (iter.hasNext()) {
 			Map.Entry entry = (Entry) iter.next();
 			msgSeq = (MessageSeq) entry.getKey();
 			MessageDTO dto = MessageDTO.getMessageDTO((Message) entry.getValue());
@@ -519,34 +569,39 @@
 		}
 		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) {
+
+	/**
+	* 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) {
+			}
+			catch (FileNotFoundException e) {
 				throw new ForumException("FileNotFoundException occured while trying to upload File" + e.getMessage());
-			} catch (RepositoryCheckedException e) {
+			}
+			catch (RepositoryCheckedException e) {
 				throw new ForumException("FileNotFoundException occured while trying to upload File" + e.getMessage());
-			} catch (IOException e) {
+			}
+			catch (IOException e) {
 				throw new ForumException("FileNotFoundException occured while trying to upload File" + e.getMessage());
 			}
-          }
-        return node;
-    }
+		}
+		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.
@@ -559,98 +614,102 @@
 	 * @throws SubmitFilesException
 	 */
 	private ITicket getRepositoryLoginTicket() throws ForumException {
-		ICredentials credentials = new SimpleCredentials(
-				forumToolContentHandler.getRepositoryUser(),
-				forumToolContentHandler.getRepositoryId());
+		ICredentials credentials = new SimpleCredentials(forumToolContentHandler.getRepositoryUser(), forumToolContentHandler
+				.getRepositoryId());
 		try {
-			ITicket ticket = repositoryService.login(credentials,
-					forumToolContentHandler.getRepositoryWorkspaceName());
+			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) {
+		}
+		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";
-    	    log.error(error);
-    	    throw new ForumException(error);
-    	}
-    	
-    	return defaultForum;
 
-    }
+	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);
+		}
 
-	public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, String entryText) {
+		return defaultForum;
+
+	}
+
+	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){
+
+	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 {
+		}
+		else {
 			return list.get(0);
 		}
 	}
-	
+
 	/**
 	 * @param notebookEntry
 	 */
 	public void updateEntry(NotebookEntry notebookEntry) {
 		coreNotebookService.updateEntry(notebookEntry);
 	}
-    //***************************************************************************************************************
-    // ToolContentManager and ToolSessionManager methods
-    //***************************************************************************************************************
+
+	//***************************************************************************************************************
+	// 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");
+		if (toContentId == null) {
+			throw new ToolException("Failed to create the ForumFiles tool seession");
+		}
 
 		Forum fromContent = null;
-		if ( fromContentId != null ) {
+		if (fromContentId != null) {
 			fromContent = forumDao.getByContentId(fromContentId);
 		}
-		if ( fromContent == null ) {
+		if (fromContent == null) {
 			fromContent = getDefaultForum();
 		}
-		
-		Forum toContent = Forum.newInstance(fromContent,toContentId,forumToolContentHandler);
+
+		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){
+		if (topics != null) {
 			Iterator iter = topics.iterator();
-			while(iter.hasNext()){
+			while (iter.hasNext()) {
 				Message msg = (Message) iter.next();
 				//set this message forum Uid as toContent
-				if(!msg.getIsAuthored())
+				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);
+				createRootTopic(toContent.getUid(), (ForumToolSession) null, msg);
 			}
 		}
 
 	}
 
 	public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
 		Forum forum = forumDao.getByContentId(toolContentId);
-		if(forum == null){
+		if (forum == null) {
 			throw new ToolException("No found tool content by given content ID:" + toolContentId);
 		}
 		forum.setDefineLater(value);
@@ -659,49 +718,50 @@
 
 	public void setAsRunOffline(Long toolContentId, boolean value) throws DataMissingException, ToolException {
 		Forum forum = forumDao.getByContentId(toolContentId);
-		if(forum == null){
+		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){
+		if (removeSessionData) {
 			List list = forumToolSessionDao.getByContentId(toolContentId);
 			Iterator iter = list.iterator();
-			while(iter.hasNext()){
+			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
-     */
+	 * 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()){
+		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);
@@ -716,37 +776,39 @@
 		}
 		toolContentObj.setMessages(authorItems);
 		try {
-			exportContentService.registerFileClassForExport(Attachment.class.getName(),"fileUuid","fileVersionId");
-			exportContentService.exportToolContent( toolContentId, toolContentObj,forumToolContentHandler, rootPath);
-		} catch (ExportToolContentException e) {
+			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);
-			
-			Object toolPOJO =  exportContentService.importToolContent(toolContentPath,forumToolContentHandler,fromVersion,toVersion);
-			if(!(toolPOJO instanceof Forum))
+			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;
-			
-//			reset it to new toolContentId
+
+			//			reset it to new toolContentId
 			toolContentObj.setContentId(toolContentId);
 			ForumUser user = forumUserDao.getByUserId(new Long(newUserUid.longValue()));
-			if(user == null){
+			if (user == null) {
 				user = new ForumUser();
-				UserDTO sysUser = ((User)userManagementService.findById(User.class,newUserUid)).getUserDTO();
+				UserDTO sysUser = ((User) userManagementService.findById(User.class, newUserUid)).getUserDTO();
 				user.setFirstName(sysUser.getFirstName());
 				user.setLastName(sysUser.getLastName());
 				user.setLoginName(sysUser.getLogin());
@@ -756,35 +818,35 @@
 			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){
+			for (Message item : items) {
 				item.setCreatedBy(user);
 				item.setIsAuthored(true);
 				item.setForum(toolContentObj);
 				item.setSessionClones(new HashSet());
-				createRootTopic(toolContentObj.getUid(),(ForumToolSession) null,item);
+				createRootTopic(toolContentObj.getUid(), (ForumToolSession) null, item);
 			}
-		} catch (ImportToolContentException e) {
+		}
+		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
-     */
+	/** 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 ) {
+		if (forum == null) {
 			forum = getDefaultForum();
 		}
 		return getForumOutputFactory().getToolOutputDefinitions(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 {
@@ -793,15 +855,16 @@
 		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.
-		log.debug("Clone tool content [" + forum.getContentId() +"] topics for session [" + session.getSessionId() + "]");		
+
+		//		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){
+		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);
@@ -811,30 +874,32 @@
 		session.setStatus(ForumConstants.STATUS_CONTENT_COPYED);
 
 		forumToolSessionDao.saveOrUpdate(session);
-		log.debug("tool session ["+session.getSessionId()+"] created.");
+		ForumService.log.debug("tool session [" + session.getSessionId() + "] created.");
 	}
 
 	public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
-		if(toolSessionId == null){
-			log.error("Fail to leave tool Session based on null tool session id.");
+		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){
-			log.error("Fail to leave tool Session based on null learner.");
+		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.");
 		}
-		
+
 		ForumToolSession session = forumToolSessionDao.getBySessionId(toolSessionId);
-		if(session != null){
+		if (session != null) {
 			forumToolSessionDao.saveOrUpdate(session);
-		}else{
-			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);
+		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 ToolSessionExportOutputData exportToolSession(Long toolSessionId) throws DataMissingException, ToolException {
 		return null;
 	}
@@ -843,18 +908,16 @@
 		return null;
 	}
 
-	
 	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) {
-		
+	public SortedMap<String, ToolOutput> getToolOutput(List<String> names, Long toolSessionId, Long learnerId) {
+
 		return forumOutputFactory.getToolOutput(names, this, toolSessionId, learnerId);
 
 	}
@@ -863,31 +926,29 @@
 	 * 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) {
+	public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 		return forumOutputFactory.getToolOutput(name, 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";
-    	    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);
-    	
+		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);
+
 		Set topics = content.getMessages();
-		if(topics != null){
+		if (topics != null) {
 			Iterator iter = topics.iterator();
-			while(iter.hasNext()){
+			while (iter.hasNext()) {
 				Message msg = (Message) iter.next();
 				//clear message forum so that they can be saved when persistent happens
 				msg.setForum(null);
@@ -896,147 +957,152 @@
 
 		return content;
 	}
+
 	public List<MessageDTO> getAllTopicsFromSession(Long sessionID) {
 		return MessageDTO.getMessageDTO(messageDao.getBySession(sessionID));
 	}
+
 	/* ===============Methods implemented from ToolContentImport102Manager =============== */
-	
 
-    /**
-     * 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();
+	/**
+	 * 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();
 
-    	try {
-	
-	    	toolContentObj.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
+		try {
 
-	    	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);
+			toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
 
-	    	// 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.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);
 
-	    	// 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
+			// 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);
 
-	    	ForumUser forumUser = new ForumUser();
+			// 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
+
+			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);
-	
-	    	// leave as empty, no need to set them to anything.
-	    	//toolContentObj.setAttachments(attachments);
-	    	forumDao.saveOrUpdate(toolContentObj);
-	
-	    	// 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);
+			toolContentObj.setCreatedBy(forumUser);
+
+			// leave as empty, no need to set them to anything.
+			//toolContentObj.setAttachments(attachments);
+			forumDao.saveOrUpdate(toolContentObj);
+
+			// 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);
-	    		}
-	    		
-	        	iter = messageMaps.values().iterator();
-	        	while ( iter.hasNext() ) {
-	        			
-	    			Map messageMap = (Map) iter.next();
-	
-	    			Message message = new Message();
-	    			message.setIsAuthored(true);
-	    			
-	    			// 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) {
-			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.");
-		}
+			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);
+				}
 
+				iter = messageMaps.values().iterator();
+				while (iter.hasNext()) {
 
+					Map messageMap = (Map) iter.next();
 
-    }
+					Message message = new Message();
+					message.setIsAuthored(true);
 
-   /** 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.");
-    	}
+					// 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();
 
-    	toolContentObj.setReflectOnActivity(Boolean.TRUE);
-    	toolContentObj.setReflectInstructions(description);
-    }
+					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);
 
-    //***************************************************************************************************************
-    // Get / Set methods
-    //***************************************************************************************************************
+					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.");
+		}
+
+	}
+
+	/** 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.");
+		}
+
+		toolContentObj.setReflectOnActivity(Boolean.TRUE);
+		toolContentObj.setReflectInstructions(description);
+	}
+
+	//***************************************************************************************************************
+	// Get / Set methods
+	//***************************************************************************************************************
 	public ILamsToolService getToolService() {
 		return toolService;
 	}
 
 	public void setToolService(ILamsToolService toolService) {
 		this.toolService = toolService;
 	}
-	
+
 	public AttachmentDao getAttachmentDao() {
 		return attachmentDao;
 	}
@@ -1061,7 +1127,6 @@
 		this.messageDao = messageDao;
 	}
 
-
 	public MessageSeqDao getMessageSeqDao() {
 		return messageSeqDao;
 	}
@@ -1093,12 +1158,13 @@
 	public void setRepositoryService(IRepositoryService repositoryService) {
 		this.repositoryService = repositoryService;
 	}
+
 	public ForumToolContentHandler getForumToolContentHandler() {
 		return forumToolContentHandler;
 	}
 
 	public void setForumToolContentHandler(ForumToolContentHandler toolContentHandler) {
-		this.forumToolContentHandler = toolContentHandler;
+		forumToolContentHandler = toolContentHandler;
 	}
 
 	public ILearnerService getLearnerService() {
@@ -1116,11 +1182,11 @@
 	public void setExportContentService(IExportToolContentService exportContentService) {
 		this.exportContentService = exportContentService;
 	}
+
 	public IUserManagementService getUserManagementService() {
 		return userManagementService;
 	}
 
-
 	public void setUserManagementService(IUserManagementService userManagementService) {
 		this.userManagementService = userManagementService;
 	}
@@ -1141,5 +1207,15 @@
 		this.coreNotebookService = coreNotebookService;
 	}
 
+	public IEventNotificationService getEventNotificationService() {
+		return eventNotificationService;
+	}
 
+	public void setEventNotificationService(IEventNotificationService eventNotificationService) {
+		this.eventNotificationService = eventNotificationService;
+	}
+
+	public String getLocalisedMessage(String key, Object[] args) {
+		return messageService.getMessage(key, args);
+	}
 }
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -r86ef0c92b6e5b8a3915fcc960b918ab95b629503 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 86ef0c92b6e5b8a3915fcc960b918ab95b629503)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -21,15 +21,15 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.forum.service;
 
 import java.util.List;
 
 import org.apache.struts.upload.FormFile;
+import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
-import org.lamsfoundation.lams.tool.forum.dto.UserDTO;
 import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumReport;
@@ -48,94 +48,102 @@
 	//************************************************************************************
 	// 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);
 	/**
+	 * 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;
-    /**
-     * 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 ID(not record UID)
-     * @param contentID
-     * @return
-     * @throws PersistenceException
-     */
-    public Forum getForumByContentId(Long contentID) throws PersistenceException;
+	public Forum updateForum(Forum forum) throws PersistenceException;
 
-    /**
-     * Delete authoring page instruction files.
-     * @param attachmentId
-     * @throws PersistenceException
-     */
-    public void deleteForumAttachment(Long attachmentId) 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 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;
+
 	//************************************************************************************
 	//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;
-    /**
-     * 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;
+	/**
+	 * Create a root topic.
+	 * @param forumId
+	 * @param sessionId
+	 * @param message
+	 * @return
+	 * @throws PersistenceException
+	 */
+	public Message createRootTopic(Long forumId, 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;
 	/**
+	 * 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;
+
+	/**
+	 * 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;
+
+	/**
 	 * Upload message attachment file into repository.
 	 * This method only upload the given file into system repository. It does not execute any database operation.
 	 * 
@@ -153,7 +161,7 @@
 	 * @throws PersistenceException
 	 */
 	public void deleteFromRepository(Long uuID, Long versionID) throws PersistenceException;
-	
+
 	//************************************************************************************
 	//*********************Get topic methods **********************
 	//************************************************************************************
@@ -166,6 +174,7 @@
 	 * 		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.
@@ -178,47 +187,53 @@
 	 * 		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);
+
 	/**
 	 * 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 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
-     */
+
+	/**
+	 * 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 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);	
+	public int getNumOfPostsByTopic(Long userId, Long topicId);
 
 	//************************************************************************************
 	// Session Method
@@ -236,65 +251,75 @@
 	 * @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);
+
 	//************************************************************************************
 	// 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 list by given session ID.
-     * @param sessionID
-     * @return
-     */
-    public List getUsersBySessionId(Long sessionID);
 	/**
+	 * 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 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 user ID
 	 * @param userId
 	 * @return
 	 */
 	public ForumUser getUserByID(Long userId);
+
 	/**
 	 * Update forum message report.
 	 * @param report
 	 */
 	public void updateReport(ForumReport report);
+
 	//************************************************************************************
 	// Report  Method
 	//************************************************************************************
-	
+
 	//************************************************************************************
 	// 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( );
+	public IAuditService getAuditService();
+
 	/**
 	 * Mark user completing a session.  
 	 * @param currentUser
 	 */
 	public void finishUserSession(ForumUser currentUser);
+
 	/**
 	 * Create refection entry into notebook tool.
 	 * @param sessionId
@@ -303,7 +328,9 @@
 	 * @param userId
 	 * @param entryText
 	 */
-	public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, String entryText);
+	public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId,
+			String entryText);
+
 	/**
 	 * Get reflection entry from notebook tool.
 	 * @param sessionId
@@ -313,9 +340,19 @@
 	 * @return
 	 */
 	public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID);
-	
+
 	/**
 	 * @param notebookEntry
 	 */
 	public void updateEntry(NotebookEntry notebookEntry);
+
+	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);
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -r86ef0c92b6e5b8a3915fcc960b918ab95b629503 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 86ef0c92b6e5b8a3915fcc960b918ab95b629503)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -21,7 +21,7 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.forum.util;
 
 /**
@@ -31,45 +31,60 @@
  */
 public interface ForumConstants {
 	public static final String TOOL_SIGNATURE = "lafrum11";
+
 	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;
-	
+	public static final boolean OLD_FORUM_STYLE = true;
+
 	public static final int STATUS_CONTENT_COPYED = 1;
+
 	public static final int SESSION_STATUS_FINISHED = 1;
-	
-    public final static int MAX_FILE_SIZE = 250 * 1000;
-    public final static String FORUM_SERVICE = "forumService";
-    
-    public final static String CONTENT_HANDLER = "toolContentHandler";
 
+	public final static int MAX_FILE_SIZE = 250 * 1000;
+
+	public final static String FORUM_SERVICE = "forumService";
+
+	public final static String CONTENT_HANDLER = "toolContentHandler";
+
 	public static final String AUTHORING_DTO = "authoring";
+
 	public static final String AUTHORING_TOPICS_LIST = "topicList";
+
 	public static final String AUTHORING_TOPICS_INDEX = "topicIndex";
+
 	public static final String AUTHORING_TOPIC_THREAD = "topicThread";
+
 	public static final String AUTHORING_TOPIC = "topic";
-	
+
 	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/";
+
 	public static final String FORUM_ID = "forum_id";
 
 	public static final String ATTR_ALLOW_EDIT = "allowEdit";
+
 	public static final String ATTR_ALLOW_UPLOAD = "allowUpload";
+
 	public static final String ATTR_ALLOW_NEW_TOPICS = "allowNewTopics";
+
 	public static final String ATTR_ALLOW_RICH_EDITOR = "allowRichEditor";
+
 	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 OFFLINE_ATTACHMENT = "offline_att";
 
 	public static final String ATTACHMENT_LIST = "attachmentList";
+
 	public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList";
 
 	public static final String TOPIC_DELETED_ATTACHMENT_LIST = "topicDeletedAttachmentList";
@@ -79,29 +94,38 @@
 	public static final String USER_UID = "userID";
 
 	public static final String ATTR_FINISHED_LOCK = "finishedLock";
-	
+
 	public static final String ATTR_USER_FINISHED = "userFinished";
-	
+
 	// used in monitoring 
 	public static final String TITLE = "title";
+
 	public static final String INSTRUCTIONS = "instructions";
+
 	public static final String PAGE_EDITABLE = "isPageEditable";
 
 	public static final String ATTR_ROOT_TOPIC_UID = "rootUid";
 
 	public static final String ATTR_FORUM_TITLE = "title";
+
 	public static final String ATTR_FORUM_INSTRCUTION = "instruction";
 
 	public static final String ATTR_TOOL_CONTENT_TOPICS = "ToolContentTopicList";
+
 	public static final String ATTR_TOPIC = "topic";
-	public static final String ATTR_USER= "user";
-	public static final String ATTR_USER_UID= "userUid";
+
+	public static final String ATTR_USER = "user";
+
+	public static final String ATTR_USER_UID = "userUid";
+
 	public static final String ATTR_REPORT = "report";
+
 	public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag";
-	
+
 	public static final String PARAM_UPDATE_MODE = "updateMode";
 
 	public static final String ATTR_NO_MORE_POSTS = "noMorePosts";
+
 	public static final String ATTR_NUM_OF_POSTS = "numOfPosts";
 
 	public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
@@ -112,21 +136,25 @@
 	public static final String ATTR_ORIGINAL_MESSAGE = "originalMessage";
 
 	public static final String ATTR_TOPIC_ID = "topicID";
+
 	public static final String ATTR_REFLECTION_ON = "reflectOn";
+
 	public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions";
+
 	public static final String ATTR_REFLECTION_ENTRY = "reflectEntry";
 
 	public static final String ATTR_MINIMUM_REPLY = "minimumReply";
+
 	public static final String ATTR_MAXIMUM_REPLY = "maximumReply";
-	
+
 	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_FORUM = "viewForum";
 
 	public static final String ATTR_HIDE_REFLECTION = "hideReflection";
 
+	public static final String EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE = "notify_learners_on_mark_release";
 
-
-	
-	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
diff -u -r9c1a7248e1f8524cae4d475b1d2bd62c5eaaacb2 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 9c1a7248e1f8524cae4d475b1d2bd62c5eaaacb2)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -21,7 +21,7 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.forum.web.actions;
 
 import java.io.IOException;
@@ -44,6 +44,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -81,9 +82,9 @@
 
 	private IForumService forumService;
 
-	public final ActionForward execute(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response)
-			throws Exception {
+	@Override
+	public final ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws Exception {
 		String param = mapping.getParameter();
 		// --------------Forum Level ------------------
 		if (param.equals("viewForum")) {
@@ -121,21 +122,18 @@
 		if (param.equals("updateMessageHideFlag")) {
 			return updateMessageHideFlag(mapping, form, request, response);
 		}
-		
+
 		//================ Reflection =======================
 		if (param.equals("newReflection")) {
 			return newReflection(mapping, form, request, response);
 		}
 		if (param.equals("submitReflection")) {
 			return submitReflection(mapping, form, request, response);
 		}
-		
-		
+
 		return mapping.findForward("error");
 	}
 
-
-
 	// ==========================================================================================
 	// Forum level methods
 	// ==========================================================================================
@@ -145,27 +143,30 @@
 	 * @throws Exception 
 	 * 
 	 */
-	private ActionForward viewForum(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
+	private ActionForward viewForum(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws Exception {
+
 		//initial Session Map 
 		String sessionMapID = request.getParameter(ForumConstants.ATTR_SESSION_MAP_ID);
-		SessionMap<String,Object> sessionMap;
+		SessionMap<String, Object> sessionMap;
 		//refresh forum page, not initial enter
-		if(sessionMapID != null){
+		if (sessionMapID != null) {
 			sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-		}else{
-			sessionMap = new SessionMap<String,Object>();
+		}
+		else {
+			sessionMap = new SessionMap<String, Object>();
 			request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+
 		}
 		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-		
+
 		// set the mode into http session
 		ToolAccessMode mode = null;
 		try {
-			mode = WebUtil.readToolAccessModeParam(request,AttributeNames.PARAM_MODE, MODE_OPTIONAL);
-		} catch (Exception exp) {
+			mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, LearningAction.MODE_OPTIONAL);
 		}
+		catch (Exception exp) {
+		}
 		if (mode == null) {
 			//set it as default mode
 			mode = ToolAccessMode.LEARNER;
@@ -179,36 +180,36 @@
 		ForumToolSession session = forumService.getSessionBySessionId(sessionId);
 
 		if (session == null || session.getForum() == null) {
-			log.error("Failed on getting session by given sessionID:" + sessionId);
+			LearningAction.log.error("Failed on getting session by given sessionID:" + sessionId);
 			throw new Exception("Failed on getting session by given sessionID:" + sessionId);
 		}
 
 		Forum forum = session.getForum();
 		//lock on finish
-		ForumUser forumUser = getCurrentUser(request,sessionId);
-		boolean lock =  forum.getLockWhenFinished() && forumUser.isSessionFinished();
-				
+		ForumUser forumUser = getCurrentUser(request, sessionId);
+		boolean lock = forum.getLockWhenFinished() && forumUser.isSessionFinished();
+
 		//set some option flag to HttpSession
 		// if allowRichEditor = true then don't restrict the number of chars
 		// if isLimitedInput = false then don't restrict the number of chars
 		// Indicate don't restrict number of chars by allowNumber = 0
 		Long forumId = forum.getUid();
 		Boolean allowRichEditor = new Boolean(forum.isAllowRichEditor());
 		int allowNumber = forum.isLimitedInput() || forum.isAllowRichEditor() ? forum.getLimitedChar() : 0;
-		
+
 		sessionMap.put(ForumConstants.FORUM_ID, forumId);
 		sessionMap.put(AttributeNames.ATTR_MODE, mode);
 		sessionMap.put(ForumConstants.ATTR_FINISHED_LOCK, new Boolean(lock));
 		sessionMap.put(ForumConstants.ATTR_LOCK_WHEN_FINISHED, forum.getLockWhenFinished());
 		sessionMap.put(ForumConstants.ATTR_USER_FINISHED, forumUser.isSessionFinished());
 		sessionMap.put(ForumConstants.ATTR_ALLOW_EDIT, forum.isAllowEdit());
-		sessionMap.put(ForumConstants.ATTR_ALLOW_UPLOAD,forum.isAllowUpload());
-		sessionMap.put(ForumConstants.ATTR_ALLOW_NEW_TOPICS,forum.isAllowNewTopic());
-		sessionMap.put(ForumConstants.ATTR_ALLOW_RICH_EDITOR,allowRichEditor);
-		sessionMap.put(ForumConstants.ATTR_LIMITED_CHARS,new Integer(allowNumber));
+		sessionMap.put(ForumConstants.ATTR_ALLOW_UPLOAD, forum.isAllowUpload());
+		sessionMap.put(ForumConstants.ATTR_ALLOW_NEW_TOPICS, forum.isAllowNewTopic());
+		sessionMap.put(ForumConstants.ATTR_ALLOW_RICH_EDITOR, allowRichEditor);
+		sessionMap.put(ForumConstants.ATTR_LIMITED_CHARS, new Integer(allowNumber));
 		sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
-		sessionMap.put(ForumConstants.ATTR_FORUM_TITLE,forum.getTitle());
-		sessionMap.put(ForumConstants.ATTR_FORUM_INSTRCUTION,forum.getInstructions());
+		sessionMap.put(ForumConstants.ATTR_FORUM_TITLE, forum.getTitle());
+		sessionMap.put(ForumConstants.ATTR_FORUM_INSTRCUTION, forum.getInstructions());
 		sessionMap.put(ForumConstants.ATTR_MINIMUM_REPLY, forum.getMinimumReply());
 		sessionMap.put(ForumConstants.ATTR_MAXIMUM_REPLY, forum.getMaximumReply());
 
@@ -219,42 +220,55 @@
 		boolean hideReflection = WebUtil.readBooleanParam(request, ForumConstants.ATTR_HIDE_REFLECTION, false);
 		sessionMap.put(ForumConstants.ATTR_HIDE_REFLECTION, hideReflection);
 
-		if ( hideReflection ) {
-			sessionMap.put(ForumConstants.ATTR_REFLECTION_ON,false);
-			sessionMap.put(ForumConstants.ATTR_REFLECTION_INSTRUCTION,"");
+		if (hideReflection) {
+			sessionMap.put(ForumConstants.ATTR_REFLECTION_ON, false);
+			sessionMap.put(ForumConstants.ATTR_REFLECTION_INSTRUCTION, "");
 			sessionMap.put(ForumConstants.ATTR_REFLECTION_ENTRY, "");
-		} else {
-			sessionMap.put(ForumConstants.ATTR_REFLECTION_ON,forum.isReflectOnActivity());
-			sessionMap.put(ForumConstants.ATTR_REFLECTION_INSTRUCTION,forum.getReflectInstructions());
+		}
+		else {
+			sessionMap.put(ForumConstants.ATTR_REFLECTION_ON, forum.isReflectOnActivity());
+			sessionMap.put(ForumConstants.ATTR_REFLECTION_INSTRUCTION, forum.getReflectInstructions());
 
-			NotebookEntry notebookEntry = forumService.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, 
+			NotebookEntry notebookEntry = forumService.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
 					ForumConstants.TOOL_SIGNATURE, forumUser.getUserId().intValue());
 			sessionMap.put(ForumConstants.ATTR_REFLECTION_ENTRY, notebookEntry != null ? notebookEntry.getEntry() : "");
 		}
 
 		//add define later support
-		if(forum.isDefineLater()){
+		if (forum.isDefineLater()) {
 			return mapping.findForward("defineLater");
 		}
-		
+
 		//set contentInUse flag to true!
 		forum.setContentInUse(true);
 		forum.setDefineLater(false);
 		forumService.updateForum(forum);
-		
+
 		//add run offline support
-		if(forum.getRunOffline()){
+		if (forum.getRunOffline()) {
 			return mapping.findForward("runOffline");
 		}
-				
+
 		// get all root topic to display on init page
 		List rootTopics = forumService.getRootTopics(sessionId);
 		if (!forum.isAllowNewTopic()) {
 			// add the number post the learner has made for each topic.
 			updateNumOfPosts(rootTopics, forumUser);
 		}
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, rootTopics);
-		
+
+		if (forum.isNotifyLearnersOnMarkRelease()) {
+			forumService.getEventNotificationService().createEvent(ForumConstants.TOOL_SIGNATURE,
+					ForumConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, forum.getContentId(),
+					forumService.getLocalisedMessage("event.mark.release.subject", null),
+					forumService.getLocalisedMessage("event.mark.release.body", null));
+
+			forumService.getEventNotificationService().subscribe(ForumConstants.TOOL_SIGNATURE,
+					ForumConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, forum.getContentId(),
+					forumUser.getUserId().longValue(), IEventNotificationService.DELIVERY_METHOD_MAIL,
+					IEventNotificationService.PERIODICITY_SINGLE);
+		}
+
 		return mapping.findForward("success");
 	}
 
@@ -276,37 +290,40 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward finish(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
+	private ActionForward finish(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-		
+
 		ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
 		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
-		
+
 		forumService = getForumManager();
-		
-		if (mode == ToolAccessMode.LEARNER || mode==ToolAccessMode.AUTHOR) {
-			if(!validateBeforeFinish(request, sessionMapID))
+
+		if (mode == ToolAccessMode.LEARNER || mode == ToolAccessMode.AUTHOR) {
+			if (!validateBeforeFinish(request, sessionMapID)) {
 				return mapping.getInputForward();
+			}
 
 			String nextActivityUrl;
 			try {
-//				 get session from shared session.
+				//				 get session from shared session.
 				HttpSession ss = SessionManager.getSession();
 				UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 				Long userID = new Long(user.getUserID().longValue());
-				
+
 				//finish current session for user
 				forumService.finishUserSession(getCurrentUser(request, sessionId));
 				ToolSessionManager sessionMgrService = ForumServiceProxy.getToolSessionManager(getServlet().getServletContext());
-				nextActivityUrl = sessionMgrService.leaveToolSession(sessionId,userID);
+				nextActivityUrl = sessionMgrService.leaveToolSession(sessionId, userID);
 				response.sendRedirect(nextActivityUrl);
-			} catch (DataMissingException e) {
+			}
+			catch (DataMissingException e) {
 				throw new ForumException(e);
-			} catch (ToolException e) {
+			}
+			catch (ToolException e) {
 				throw new ForumException(e);
-			} catch (IOException e) {
+			}
+			catch (IOException e) {
 				throw new ForumException(e);
 			}
 			return null;
@@ -315,12 +332,10 @@
 		// get all root topic to display on init page
 		List rootTopics = forumService.getRootTopics(sessionId);
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, rootTopics);
-		
+
 		return mapping.getInputForward();
 	}
 
-
-
 	/**
 	 * Submit reflection form input database.
 	 * @param mapping
@@ -333,23 +348,21 @@
 			HttpServletResponse response) {
 		ReflectionForm refForm = (ReflectionForm) form;
 		Integer userId = refForm.getUserID();
-		
+
 		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
-		
+
 		// check for existing notebook entry
-		NotebookEntry entry = forumService.getEntry(sessionId,
-				CoreNotebookConstants.NOTEBOOK_TOOL,
+		NotebookEntry entry = forumService.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
 				ForumConstants.TOOL_SIGNATURE, userId);
 
 		if (entry == null) {
 			// create new entry
-			forumService.createNotebookEntry(sessionId,
-					CoreNotebookConstants.NOTEBOOK_TOOL,
-					ForumConstants.TOOL_SIGNATURE, userId, refForm
-							.getEntryText());
-		} else {
+			forumService.createNotebookEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, ForumConstants.TOOL_SIGNATURE,
+					userId, refForm.getEntryText());
+		}
+		else {
 			// update existing entry
 			entry.setEntry(refForm.getEntryText());
 			entry.setLastModified(new Date());
@@ -358,7 +371,7 @@
 
 		return finish(mapping, form, request, response);
 	}
-	
+
 	/**
 	 * Display empty reflection form.
 	 * @param mapping
@@ -369,32 +382,35 @@
 	 */
 	private ActionForward newReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		
+
 		//get session value
 		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
-		if(!validateBeforeFinish(request, sessionMapID))
+		if (!validateBeforeFinish(request, sessionMapID)) {
 			return mapping.getInputForward();
+		}
 
 		ReflectionForm refForm = (ReflectionForm) form;
 		HttpSession ss = SessionManager.getSession();
 		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		
+
 		refForm.setUserID(user.getUserID());
 		refForm.setSessionMapID(sessionMapID);
-		
+
 		// get the existing reflection entry
 		IForumService submitFilesService = getForumManager();
-		
-		SessionMap map = (SessionMap)request.getSession().getAttribute(sessionMapID);
-		Long toolSessionID = (Long)map.get(AttributeNames.PARAM_TOOL_SESSION_ID);
-		NotebookEntry entry = submitFilesService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL, ForumConstants.TOOL_SIGNATURE, user.getUserID());
-		
+
+		SessionMap map = (SessionMap) request.getSession().getAttribute(sessionMapID);
+		Long toolSessionID = (Long) map.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+		NotebookEntry entry = submitFilesService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
+				ForumConstants.TOOL_SIGNATURE, user.getUserID());
+
 		if (entry != null) {
 			refForm.setEntryText(entry.getEntry());
 		}
-		
+
 		return mapping.findForward("success");
 	}
+
 	// ==========================================================================================
 	// Topic level methods
 	// ==========================================================================================
@@ -409,35 +425,36 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward viewTopic(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		
+	private ActionForward viewTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+
 		forumService = getForumManager();
-		
+
 		Long rootTopicId = WebUtil.readLongParam(request, ForumConstants.ATTR_TOPIC_ID);
-		
+
 		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 		sessionMap.put(ForumConstants.ATTR_ROOT_TOPIC_UID, rootTopicId);
-		
+
 		// get forum user and forum
-		ForumUser forumUser = getCurrentUser(request, (Long)sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID));
+		ForumUser forumUser = getCurrentUser(request, (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID));
 		Forum forum = forumUser.getSession().getForum();
-		
+
 		// get root topic list
 		List<MessageDTO> msgDtoList = forumService.getTopicThread(rootTopicId);
 		updateMesssageFlag(msgDtoList);
 		request.setAttribute(ForumConstants.AUTHORING_TOPIC_THREAD, msgDtoList);
-		
+
 		// check if we can still make posts in this topic
-		int numOfPosts = forumService.getNumOfPostsByTopic(forumUser.getUserId(), ((MessageDTO)msgDtoList.get(0)).getMessage().getUid());
-		boolean noMorePosts = (forum.getMaximumReply() != 0 && numOfPosts >= forum.getMaximumReply() && (!forum.isAllowNewTopic()))?Boolean.TRUE:Boolean.FALSE;
+		int numOfPosts = forumService.getNumOfPostsByTopic(forumUser.getUserId(), msgDtoList.get(0).getMessage().getUid());
+		boolean noMorePosts = forum.getMaximumReply() != 0 && numOfPosts >= forum.getMaximumReply() && !forum.isAllowNewTopic() ? Boolean.TRUE
+				: Boolean.FALSE;
 		request.setAttribute(ForumConstants.ATTR_NO_MORE_POSTS, noMorePosts);
 		request.setAttribute(ForumConstants.ATTR_NUM_OF_POSTS, numOfPosts);
-		
+
 		//transfer SessionMapID as well
 		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-		
+
 		// Should we show the reflection or not? We shouldn't show it when the View Forum screen is accessed
 		// from the Monitoring Summary screen, but we should when accessed from the Learner Progress screen.
 		// Need to constantly past this value on, rather than hiding just the once, as the View Forum
@@ -450,7 +467,6 @@
 
 	}
 
-
 	/**
 	 * Display empty page for a new topic in forum
 	 * 
@@ -460,10 +476,10 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward newTopic(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
+	private ActionForward newTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
 		//transfer SessionMapID as well
-		((MessageForm)form).setSessionMapID(WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID));
+		((MessageForm) form).setSessionMapID(WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID));
 
 		return mapping.findForward("success");
 	}
@@ -480,9 +496,8 @@
 	 * @throws ServletException
 	 * @throws PersistenceException
 	 */
-	public ActionForward createTopic(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response)
-			throws IOException, ServletException, PersistenceException {
+	public ActionForward createTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws IOException, ServletException, PersistenceException {
 
 		MessageForm messageForm = (MessageForm) form;
 		SessionMap sessionMap = getSessionMap(request, messageForm);
@@ -494,24 +509,23 @@
 		message.setCreated(new Date());
 		message.setUpdated(new Date());
 		message.setLastReplyDate(new Date());
-		ForumUser forumUser = getCurrentUser(request,sessionId);
+		ForumUser forumUser = getCurrentUser(request, sessionId);
 		message.setCreatedBy(forumUser);
 		message.setModifiedBy(forumUser);
 		setAttachment(messageForm, message);
-		
+
 		// save message into database
 		forumService = getForumManager();
 		forumService.createRootTopic(forumId, sessionId, message);
 
 		// echo back current root topic to fourm init page
 		List rootTopics = forumService.getRootTopics(sessionId);
 		request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, rootTopics);
-		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID,messageForm.getSessionMapID());
-		
+		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, messageForm.getSessionMapID());
+
 		return mapping.findForward("success");
 	}
 
-
 	/**
 	 * Display replay topic page. Message form subject will include parent
 	 * topics same subject.
@@ -522,33 +536,35 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward newReplyTopic(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
+	private ActionForward newReplyTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
 		String sessionMapID = request.getParameter(ForumConstants.ATTR_SESSION_MAP_ID);
-		
+
 		MessageForm msgForm = (MessageForm) form;
 		msgForm.setSessionMapID(sessionMapID);
-		
+
 		Long parentId = WebUtil.readLongParam(request, ForumConstants.ATTR_PARENT_TOPIC_ID);
 		// get parent topic, it can decide default subject of reply.
 		MessageDTO topic = getTopic(parentId);
 
 		if (topic != null && topic.getMessage() != null) {
 			String reTitle = topic.getMessage().getSubject();
-			
+
 			MessageDTO originalMessage = MessageDTO.getMessageDTO(topic.getMessage());
-			
+
 			request.setAttribute(ForumConstants.ATTR_ORIGINAL_MESSAGE, originalMessage);
-			
+
 			// echo back current topic subject to web page
-			if(reTitle != null && !reTitle.trim().startsWith("Re:"))
+			if (reTitle != null && !reTitle.trim().startsWith("Re:")) {
 				msgForm.getMessage().setSubject("Re:" + reTitle);
-			else
+			}
+			else {
 				msgForm.getMessage().setSubject(reTitle);
+			}
 		}
 		SessionMap sessionMap = getSessionMap(request, msgForm);
 		sessionMap.put(ForumConstants.ATTR_PARENT_TOPIC_ID, parentId);
-	
+
 		// Should we show the reflection or not? We shouldn't show it when the View Forum screen is accessed
 		// from the Monitoring Summary screen, but we should when accessed from the Learner Progress screen.
 		// Need to constantly past this value on, rather than hiding just the once, as the View Forum
@@ -560,7 +576,6 @@
 		return mapping.findForward("success");
 	}
 
-
 	/**
 	 * Create a replayed topic for a parent topic.
 	 * 
@@ -570,26 +585,24 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward replyTopic(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		
-		
+	private ActionForward replyTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+
 		MessageForm messageForm = (MessageForm) form;
 		SessionMap sessionMap = getSessionMap(request, messageForm);
 		Long parentId = (Long) sessionMap.get(ForumConstants.ATTR_PARENT_TOPIC_ID);
-		Long sessionId =(Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
-		
+		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+
 		Message message = messageForm.getMessage();
 		message.setIsAuthored(false);
 		message.setCreated(new Date());
 		message.setUpdated(new Date());
 		message.setLastReplyDate(new Date());
-		ForumUser forumUser = getCurrentUser(request,sessionId);
+		ForumUser forumUser = getCurrentUser(request, sessionId);
 		message.setCreatedBy(forumUser);
 		message.setModifiedBy(forumUser);
 		setAttachment(messageForm, message);
 
-		
 		// save message into database
 		forumService = getForumManager();
 		forumService.replyTopic(parentId, sessionId, message);
@@ -598,20 +611,22 @@
 		Long rootTopicId = forumService.getRootTopicId(parentId);
 		List msgDtoList = forumService.getTopicThread(rootTopicId);
 		updateMesssageFlag(msgDtoList);
-		
+
 		request.setAttribute(ForumConstants.AUTHORING_TOPIC_THREAD, msgDtoList);
-		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID,messageForm.getSessionMapID());
-		
+		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, messageForm.getSessionMapID());
+
 		//check whether allow more posts for this user
 		ForumToolSession session = forumService.getSessionBySessionId(sessionId);
 		Forum forum = session.getForum();
-		int numOfPosts = forumService.getNumOfPostsByTopic(forumUser.getUserId(), ((MessageDTO)msgDtoList.get(0)).getMessage().getUid());
-		boolean noMorePosts = (forum.getMaximumReply() != 0 && numOfPosts >= forum.getMaximumReply() && (!forum.isAllowNewTopic()))?Boolean.TRUE:Boolean.FALSE;
+		int numOfPosts = forumService.getNumOfPostsByTopic(forumUser.getUserId(), ((MessageDTO) msgDtoList.get(0)).getMessage()
+				.getUid());
+		boolean noMorePosts = forum.getMaximumReply() != 0 && numOfPosts >= forum.getMaximumReply() && !forum.isAllowNewTopic() ? Boolean.TRUE
+				: Boolean.FALSE;
 		request.setAttribute(ForumConstants.ATTR_NO_MORE_POSTS, noMorePosts);
 		request.setAttribute(ForumConstants.ATTR_NUM_OF_POSTS, numOfPosts);
-		
+
 		sessionMap.remove(ForumConstants.ATTR_ORIGINAL_MESSAGE);
-		
+
 		return mapping.findForward("success");
 	}
 
@@ -625,13 +640,12 @@
 	 * @return
 	 * @throws PersistenceException
 	 */
-	public ActionForward editTopic(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response)
-			throws PersistenceException {
+	public ActionForward editTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws PersistenceException {
 		Long topicId = WebUtil.readLongParam(request, ForumConstants.ATTR_TOPIC_ID);
 
 		MessageDTO topic = getTopic(topicId);
-		
+
 		// echo current topic content to web page
 		MessageForm msgForm = (MessageForm) form;
 		if (topic != null) {
@@ -642,7 +656,7 @@
 		//cache this topicID, using in Update topic
 		SessionMap sessionMap = getSessionMap(request, msgForm);
 		sessionMap.put(ForumConstants.ATTR_TOPIC_ID, topicId);
-		
+
 		// Should we show the reflection or not? We shouldn't show it when the View Forum screen is accessed
 		// from the Monitoring Summary screen, but we should when accessed from the Learner Progress screen.
 		// Need to constantly past this value on, rather than hiding just the once, as the View Forum
@@ -653,6 +667,7 @@
 
 		return mapping.findForward("success");
 	}
+
 	/**
 	 * Delete attachment from topic. This method only reset attachment information in memory. The finally update 
 	 * will happen in <code>updateTopic</code> method. So topic can keep this attachment if user choose "Cancel" edit
@@ -666,15 +681,16 @@
 	 */
 	private ActionForward deleteAttachment(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		
+
 		//only reset not attachment flag.
 		MessageDTO dto = new MessageDTO();
 		dto.setHasAttachment(false);
 		request.setAttribute(ForumConstants.AUTHORING_TOPIC, dto);
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID));
+		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(
+				WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID));
 		request.setAttribute(ForumConstants.ATTR_ALLOW_UPLOAD, sessionMap.get(ForumConstants.ATTR_ALLOW_UPLOAD));
-		
-    	return mapping.findForward("success");
+
+		return mapping.findForward("success");
 	}
 
 	/**
@@ -687,67 +703,66 @@
 	 * @return
 	 * @throws PersistenceException
 	 */
-	public ActionForward updateTopic(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response)
-			throws PersistenceException {
+	public ActionForward updateTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws PersistenceException {
 
 		forumService = getForumManager();
-		
+
 		MessageForm messageForm = (MessageForm) form;
 		SessionMap sessionMap = getSessionMap(request, messageForm);
 		Long topicId = (Long) sessionMap.get(ForumConstants.ATTR_TOPIC_ID);
-		Message message = messageForm.getMessage();		
-		
-		boolean makeAuditEntry = ToolAccessMode.TEACHER.equals((ToolAccessMode)sessionMap.get(AttributeNames.ATTR_MODE));
+		Message message = messageForm.getMessage();
+
+		boolean makeAuditEntry = ToolAccessMode.TEACHER.equals(sessionMap.get(AttributeNames.ATTR_MODE));
 		String oldMessageString = null;
 
 		// get PO from database and sync with Form
 		Message messagePO = forumService.getMessage(topicId);
-		if ( makeAuditEntry ) {
+		if (makeAuditEntry) {
 			oldMessageString = messagePO.toString();
 		}
 		messagePO.setSubject(message.getSubject());
 		messagePO.setBody(message.getBody());
 		messagePO.setUpdated(new Date());
-		messagePO.setModifiedBy(getCurrentUser(request,(Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID)));
+		messagePO.setModifiedBy(getCurrentUser(request, (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID)));
 		setAttachment(messageForm, messagePO);
 
-		if ( makeAuditEntry ) {
+		if (makeAuditEntry) {
 			Long userId = 0L;
-    		String loginName = "Default";
-    		if(message.getCreatedBy() != null){
-    			userId = message.getCreatedBy().getUserId();
-    			loginName = message.getCreatedBy().getLoginName();
-    		}
-			forumService.getAuditService().logChange(ForumConstants.TOOL_SIGNATURE,
-					userId,loginName,
-		 			oldMessageString, messagePO.toString());
-		 } 
+			String loginName = "Default";
+			if (message.getCreatedBy() != null) {
+				userId = message.getCreatedBy().getUserId();
+				loginName = message.getCreatedBy().getLoginName();
+			}
+			forumService.getAuditService().logChange(ForumConstants.TOOL_SIGNATURE, userId, loginName, oldMessageString,
+					messagePO.toString());
+		}
 
 		// save message into database
- 	    // if we are in monitoring then we are probably editing some else's entry so log the change.
+		// if we are in monitoring then we are probably editing some else's entry so log the change.
 		forumService.updateTopic(messagePO);
 
 		// echo back this topic thread into page
 		Long rootTopicId = forumService.getRootTopicId(topicId);
 		List msgDtoList = forumService.getTopicThread(rootTopicId);
 		updateMesssageFlag(msgDtoList);
-		
+
 		// check if we can still make posts in this topic
-		ForumUser forumUser = getCurrentUser(request, (Long)sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID));
+		ForumUser forumUser = getCurrentUser(request, (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID));
 		Forum forum = forumUser.getSession().getForum();
-		int numOfPosts = forumService.getNumOfPostsByTopic(forumUser.getUserId(), ((MessageDTO)msgDtoList.get(0)).getMessage().getUid());
-		boolean noMorePosts = (forum.getMaximumReply() != 0 && numOfPosts >= forum.getMaximumReply() && (!forum.isAllowNewTopic()))?Boolean.TRUE:Boolean.FALSE;
+		int numOfPosts = forumService.getNumOfPostsByTopic(forumUser.getUserId(), ((MessageDTO) msgDtoList.get(0)).getMessage()
+				.getUid());
+		boolean noMorePosts = forum.getMaximumReply() != 0 && numOfPosts >= forum.getMaximumReply() && !forum.isAllowNewTopic() ? Boolean.TRUE
+				: Boolean.FALSE;
 		request.setAttribute(ForumConstants.ATTR_NO_MORE_POSTS, noMorePosts);
 		request.setAttribute(ForumConstants.ATTR_NUM_OF_POSTS, numOfPosts);
-		
+
 		request.setAttribute(ForumConstants.AUTHORING_TOPIC_THREAD, msgDtoList);
-		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID,messageForm.getSessionMapID());
+		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, messageForm.getSessionMapID());
 
 		return mapping.findForward("success");
 	}
 
-
 	/**
 	 * Sets the visibility of a message by updating the hide flag for a message
 	 * 
@@ -757,39 +772,39 @@
 	 * @param response
 	 * @return
 	 */
-	public ActionForward updateMessageHideFlag(ActionMapping mapping,
-			ActionForm form, HttpServletRequest request,
+	public ActionForward updateMessageHideFlag(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		
-		Long msgId = new Long(WebUtil.readLongParam(request,ForumConstants.ATTR_TOPIC_ID));
+
+		Long msgId = new Long(WebUtil.readLongParam(request, ForumConstants.ATTR_TOPIC_ID));
 		Boolean hideFlag = new Boolean(WebUtil.readBooleanParam(request, "hideFlag"));
 		forumService = getForumManager();
-		
+
 		// TODO Skipping permissions for now, currently having issues with default learning designs not having an create_by field
-//		Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+		//		Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 		// check if the user has permission to hide posts.
-//		ForumToolSession toolSession = forumService
-//				.getSessionBySessionId(sessionId);
-//		
-//		Forum forum = toolSession.getForum();
-//		ForumUser currentUser = getCurrentUser(request,sessionId);
-//		ForumUser forumCreatedBy = forum.getCreatedBy();
-	
+		//		ForumToolSession toolSession = forumService
+		//				.getSessionBySessionId(sessionId);
+		//		
+		//		Forum forum = toolSession.getForum();
+		//		ForumUser currentUser = getCurrentUser(request,sessionId);
+		//		ForumUser forumCreatedBy = forum.getCreatedBy();
+
 		// we should be looking at whether a user is a teacher and more specifically staff
-//		if (currentUser.getUserId().equals(forumCreatedBy.getUserId())) {
-			forumService.updateMessageHideFlag(msgId, hideFlag.booleanValue());
-//		} else {
-//			log.info(currentUser + "does not have permission to hide/show postings in forum: " + forum.getUid());
-//			log.info("Forum created by :" + forumCreatedBy.getUid() + ", Current User is: " + currentUser.getUid());
-//		}
-		
+		//		if (currentUser.getUserId().equals(forumCreatedBy.getUserId())) {
+		forumService.updateMessageHideFlag(msgId, hideFlag.booleanValue());
+		//		} else {
+		//			log.info(currentUser + "does not have permission to hide/show postings in forum: " + forum.getUid());
+		//			log.info("Forum created by :" + forumCreatedBy.getUid() + ", Current User is: " + currentUser.getUid());
+		//		}
+
 		// echo back this topic thread into page
 		Long rootTopicId = forumService.getRootTopicId(msgId);
 		List msgDtoList = forumService.getTopicThread(rootTopicId);
 		updateMesssageFlag(msgDtoList);
 		request.setAttribute(ForumConstants.AUTHORING_TOPIC_THREAD, msgDtoList);
-		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID,WebUtil.readStrParam(request,ForumConstants.ATTR_SESSION_MAP_ID));
-		
+		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, WebUtil
+				.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID));
+
 		return mapping.findForward("success");
 	}
 
@@ -802,36 +817,37 @@
 	private boolean validateBeforeFinish(HttpServletRequest request, String sessionMapID) {
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
-		
+
 		ForumToolSession session = forumService.getSessionBySessionId(sessionId);
 		Forum forum = session.getForum();
 		// get session from shared session.
 		HttpSession ss = SessionManager.getSession();
 		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 		Long userID = new Long(user.getUserID().longValue());
-		if(!forum.getRunOffline() && !forum.isAllowNewTopic()){
-			
+		if (!forum.getRunOffline() && !forum.isAllowNewTopic()) {
+
 			List<MessageDTO> list = forumService.getRootTopics(sessionId);
-			for (MessageDTO msgDto: list) {
+			for (MessageDTO msgDto : list) {
 				Long topicId = msgDto.getMessage().getUid();
 				int numOfPostsInTopic = forumService.getNumOfPostsByTopic(userID, topicId);
 				if (numOfPostsInTopic < forum.getMinimumReply()) {
 					//create error
 					ActionMessages errors = new ActionMessages();
-					errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("error.less.mini.post",(forum.getMinimumReply())));
+					errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.less.mini.post", forum.getMinimumReply()));
 					saveErrors(request, errors);
-					
+
 					// get all root topic to display on init page
 					List rootTopics = forumService.getRootTopics(sessionId);
 					request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, rootTopics);
-					request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID );
+					request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 					return false;
 				}
 
 			}
 		}
 		return true;
 	}
+
 	/**
 	 * This method will set flag in message DTO:
 	 * <li>If this topic is created by current login user, then set Author mark
@@ -850,12 +866,12 @@
 		Iterator iter = msgDtoList.iterator();
 		while (iter.hasNext()) {
 			MessageDTO dto = (MessageDTO) iter.next();
-			if (dto.getMessage().getCreatedBy() != null
-					&& currUserId.equals(dto.getMessage().getCreatedBy()
-							.getUserId()))
+			if (dto.getMessage().getCreatedBy() != null && currUserId.equals(dto.getMessage().getCreatedBy().getUserId())) {
 				dto.setAuthor(true);
-			else
+			}
+			else {
 				dto.setAuthor(false);
+			}
 		}
 	}
 
@@ -884,12 +900,10 @@
 		HttpSession ss = SessionManager.getSession();
 		// get back login user DTO
 		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		ForumUser forumUser = forumService.getUserByUserAndSession(new Long(
-				user.getUserID().intValue()), sessionId);
+		ForumUser forumUser = forumService.getUserByUserAndSession(new Long(user.getUserID().intValue()), sessionId);
 		if (forumUser == null) {
 			// if user not exist, create new one in database
-			ForumToolSession session = forumService
-					.getSessionBySessionId(sessionId);
+			ForumToolSession session = forumService.getSessionBySessionId(sessionId);
 			forumUser = new ForumUser(user, session);
 			forumService.createUser(forumUser);
 		}
@@ -903,11 +917,9 @@
 	 */
 	private IForumService getForumManager() {
 		if (forumService == null) {
-			WebApplicationContext wac = WebApplicationContextUtils
-					.getRequiredWebApplicationContext(getServlet()
-							.getServletContext());
-			forumService = (IForumService) wac
-					.getBean(ForumConstants.FORUM_SERVICE);
+			WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
+					.getServletContext());
+			forumService = (IForumService) wac.getBean(ForumConstants.FORUM_SERVICE);
 		}
 		return forumService;
 	}
@@ -917,32 +929,34 @@
 	 * @param message
 	 */
 	private void setAttachment(MessageForm messageForm, Message message) {
-		if (messageForm.getAttachmentFile() != null
-				&& !StringUtils.isBlank(messageForm.getAttachmentFile().getFileName())) {
+		if (messageForm.getAttachmentFile() != null && !StringUtils.isBlank(messageForm.getAttachmentFile().getFileName())) {
 			forumService = getForumManager();
-			Attachment att = forumService.uploadAttachment(messageForm
-					.getAttachmentFile());
+			Attachment att = forumService.uploadAttachment(messageForm.getAttachmentFile());
 			Set attSet = message.getAttachments();
-			if(attSet == null)
+			if (attSet == null) {
 				attSet = new HashSet();
+			}
 			// only allow one attachment, so replace whatever
 			attSet.clear();
 			attSet.add(att);
 			message.setAttachments(attSet);
-		}else if(!messageForm.isHasAttachment()){
+		}
+		else if (!messageForm.isHasAttachment()) {
 			//user already called deleteAttachment in AJAX call
-			if(message.getAttachments() != null){
+			if (message.getAttachments() != null) {
 				Set atts = message.getAttachments();
 				atts.clear();
 				message.setAttachments(atts);
-			}else
+			}
+			else {
 				message.setAttachments(null);
+			}
 		}
 	}
 
 	private SessionMap getSessionMap(HttpServletRequest request, MessageForm messageForm) {
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(messageForm.getSessionMapID());
 		return sessionMap;
 	}
-	
+
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
diff -u -rddd02019a8a100ca7c492e47d4a3a2df91ca4d31 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision ddd02019a8a100ca7c492e47d4a3a2df91ca4d31)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -21,16 +21,14 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 
 package org.lamsfoundation.lams.tool.forum.web.actions;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.text.DateFormat;
-import java.text.NumberFormat;
-import java.text.ParsePosition;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
@@ -46,7 +44,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -87,44 +84,55 @@
 	private static Logger log = Logger.getLogger(MonitoringAction.class);
 
 	private IForumService forumService;
-	
-	private class SessionDTOComparator implements Comparator<SessionDTO>{
+
+	private class SessionDTOComparator implements Comparator<SessionDTO> {
 		public int compare(SessionDTO o1, SessionDTO o2) {
-			if(o1 != null && o2 != null){
+			if (o1 != null && o2 != null) {
 				return o1.getSessionName().compareTo(o2.getSessionName());
-			}else if(o1 != null)
+			}
+			else if (o1 != null) {
 				return 1;
-			else
+			}
+			else {
 				return -1;
+			}
 		}
 	}
 
-	private class ForumUserComparator implements Comparator<ForumUser>{
+	private class ForumUserComparator implements Comparator<ForumUser> {
 		public int compare(ForumUser o1, ForumUser o2) {
-			if(o1 != null && o2 != null){
+			if (o1 != null && o2 != null) {
 				return o1.getLoginName().compareTo(o2.getLoginName());
-			}else if(o1 != null)
+			}
+			else if (o1 != null) {
 				return 1;
-			else
+			}
+			else {
 				return -1;
+			}
 		}
 	}
-	private class UserDTOComparator implements Comparator<UserDTO>{
+
+	private class UserDTOComparator implements Comparator<UserDTO> {
 		public int compare(UserDTO o1, UserDTO o2) {
-			if(o1 != null && o2 != null){
+			if (o1 != null && o2 != null) {
 				return o1.getLoginName().compareTo(o2.getLoginName());
-			}else if(o1 != null)
+			}
+			else if (o1 != null) {
 				return 1;
-			else
+			}
+			else {
 				return -1;
+			}
 		}
 	}
+
 	/**
 	 * Action method entry.
 	 */
-	public final ActionForward execute(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response)
-			throws Exception {
+	@Override
+	public final ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws Exception {
 		String param = mapping.getParameter();
 
 		if (param.equals("init")) {
@@ -150,56 +158,54 @@
 		if (param.equals("updateMark")) {
 			return updateMark(mapping, form, request, response);
 		}
-		
-		if(param.equals("releaseMark"))
-			return releaseMark(mapping, form, request, response); 
-		
+
+		if (param.equals("releaseMark")) {
+			return releaseMark(mapping, form, request, response);
+		}
+
 		// ***************** Miscellaneous ********************
 		if (param.equals("viewTopic")) {
 			return viewTopic(mapping, form, request, response);
 		}
 		if (param.equals("viewTopicTree")) {
 			return viewTopicTree(mapping, form, request, response);
 		}
-		
+
 		if (param.equals("viewReflection")) {
 			return viewReflection(mapping, form, request, response);
 		}
-		
+
 		return mapping.findForward("error");
 	}
-	
 
-
 	/**
 	 * The initial method for monitoring
 	 */
-	private ActionForward init(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		
+	private ActionForward init(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+
 		// perform the actions for all the tabs.
 		doTabs(mapping, form, request, response);
-		
+
 		return mapping.findForward("load");
 	}
-	
+
 	private ActionForward doTabs(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		//set back tool content ID
-    	String contentFolderID = WebUtil.readStrParam(request,AttributeNames.PARAM_CONTENT_FOLDER_ID);
-    	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
+		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+		request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
 
-		Long toolContentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+		Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 		request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentID);
 
-    	request.setAttribute("initialTabId", WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB,true));
+		request.setAttribute("initialTabId", WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true));
 
-   	 	this.summary(mapping, form, request, response);
-   	 	this.viewInstructions(mapping, form, request, response);
-   	 	this.viewActivity(mapping, form, request, response, toolContentID);
-   	 	this.statistic(mapping, form, request, response);
-      	return mapping.findForward("load");
+		this.summary(mapping, form, request, response);
+		this.viewInstructions(mapping, form, request, response);
+		this.viewActivity(mapping, form, request, response, toolContentID);
+		this.statistic(mapping, form, request, response);
+		return mapping.findForward("load");
 	}
-	
+
 	/**
 	 * The initial method for monitoring. List all users according to given
 	 * Content ID.
@@ -210,10 +216,8 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward summary(ActionMapping mapping,
-			ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
-		Long toolContentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+	private ActionForward summary(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 
 		forumService = getForumService();
 		List sessionsList = forumService.getSessionsByContentId(toolContentID);
@@ -228,48 +232,46 @@
 			SessionDTO sessionDto = new SessionDTO();
 			ForumToolSession fts = (ForumToolSession) it.next();
 			boolean hasReflection = fts.getForum().isReflectOnActivity();
-			
-			if (forumClone == null)
-			{
-				forumClone = (Forum)fts.getForum().clone();
+
+			if (forumClone == null) {
+				forumClone = (Forum) fts.getForum().clone();
 				request.setAttribute("forum", forumClone);
 			}
-			
+
 			sessionDto.setSessionID(fts.getSessionId());
 			sessionDto.setSessionName(fts.getSessionName());
 			List userList = forumService.getUsersBySessionId(fts.getSessionId());
-			
+
 			//sort and create DTO list
 			List topicList = forumService.getAllTopicsFromSession(fts.getSessionId());
 			Map topicsByUser = getTopicsSortedByAuthor(topicList);
 
 			Set<UserDTO> dtoList = new TreeSet<UserDTO>(this.new UserDTOComparator());
 			Iterator iter = userList.iterator();
-			while(iter.hasNext()){
+			while (iter.hasNext()) {
 				ForumUser user = (ForumUser) iter.next();
 				UserDTO userDTO = new UserDTO(user);
 				userDTO.setHasRefection(hasReflection);
-				
+
 				userDTO.setAnyPostsMarked(false);
 				userDTO.setNoOfPosts(0);
 
 				List<MessageDTO> messages = (List<MessageDTO>) topicsByUser.get(user);
-				if ( messages != null && messages.size() > 0 ) {
+				if (messages != null && messages.size() > 0) {
 					userDTO.setNoOfPosts(messages.size());
-					for ( MessageDTO message : messages ) {
-						if ( message.getMark() != null ) {
+					for (MessageDTO message : messages) {
+						if (message.getMark() != null) {
 							userDTO.setAnyPostsMarked(true);
 							break;
 						}
 					}
-				} 
+				}
 				dtoList.add(userDTO);
 			}
-			
+
 			sessionUsersMap.put(sessionDto, dtoList);
 		}
 
-		
 		// request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
 		request.setAttribute("sessionUserMap", sessionUsersMap);
 		return mapping.findForward("success");
@@ -285,18 +287,17 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward downloadMarks(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		Long sessionID = new Long(WebUtil.readLongParam(request,
-				AttributeNames.PARAM_TOOL_SESSION_ID));
+	private ActionForward downloadMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
 		forumService = getForumService();
 		List topicList = forumService.getAllTopicsFromSession(sessionID);
 		// construct Excel file format and download
 		ActionMessages errors = new ActionMessages();
 		try {
 			// create an empty excel file
 			HSSFWorkbook wb = new HSSFWorkbook();
-			
+
 			HSSFSheet sheet = wb.createSheet("Marks");
 			sheet.setColumnWidth((short) 0, (short) 5000);
 			HSSFRow row = null;
@@ -359,27 +360,28 @@
 
 					cell = row.createCell((short) idx++);
 					cell.setEncoding(HSSFCell.ENCODING_UTF_16);
-					cell.setCellValue(DateFormat.getInstance().format(
-							dto.getMessage().getCreated()));
+					cell.setCellValue(DateFormat.getInstance().format(dto.getMessage().getCreated()));
 
 					cell = row.createCell((short) idx++);
 					cell.setEncoding(HSSFCell.ENCODING_UTF_16);
 
-					if (dto.getMessage() != null
-							&& dto.getMessage().getReport() != null
-							&& dto.getMessage().getReport().getMark() != null)
-						cell.setCellValue(NumberUtil.formatLocalisedNumber(dto.getMessage().getReport().getMark(), request.getLocale(),2));
-					else
+					if (dto.getMessage() != null && dto.getMessage().getReport() != null
+							&& dto.getMessage().getReport().getMark() != null) {
+						cell.setCellValue(NumberUtil.formatLocalisedNumber(dto.getMessage().getReport().getMark(), request
+								.getLocale(), 2));
+					}
+					else {
 						cell.setCellValue("");
+					}
 
 					cell = row.createCell((short) idx++);
 					cell.setEncoding(HSSFCell.ENCODING_UTF_16);
-					if (dto.getMessage() != null
-							&& dto.getMessage().getReport() != null)
-						cell.setCellValue(dto.getMessage().getReport()
-								.getComment());
-					else
+					if (dto.getMessage() != null && dto.getMessage().getReport() != null) {
+						cell.setCellValue(dto.getMessage().getReport().getComment());
+					}
+					else {
 						cell.setCellValue("");
+					}
 				}
 			}
 			ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -394,16 +396,15 @@
 			byte[] data = bos.toByteArray();
 			response.getOutputStream().write(data, 0, data.length);
 			response.getOutputStream().flush();
-		} catch (IOException e) {
-			log.error(e);
-			errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
-					"monitoring.download.error", e.toString()));
 		}
+		catch (IOException e) {
+			MonitoringAction.log.error(e);
+			errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("monitoring.download.error", e.toString()));
+		}
 
 		if (!errors.isEmpty()) {
 			saveErrors(request, errors);
-			request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,
-					sessionID);
+			request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
 			return mapping.getInputForward();
 		}
 
@@ -419,22 +420,21 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward viewActivity(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response, Long toolContentID) {
-    	
+	private ActionForward viewActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response, Long toolContentID) {
+
 		forumService = getForumService();
 		Forum forum = forumService.getForumByContentId(toolContentID);
 		// if can not find out forum, echo back error message
 		if (forum == null) {
 			ActionErrors errors = new ActionErrors();
-			errors.add("activity.globel", new ActionMessage(
-					"error.fail.get.forum"));
+			errors.add("activity.globel", new ActionMessage("error.fail.get.forum"));
 			this.addErrors(request, errors);
 			return mapping.getInputForward();
 		}
 		String title = forum.getTitle();
 		String instruction = forum.getInstructions();
-			
+
 		boolean isForumEditable = ForumWebUtils.isForumEditable(forum);
 		request.setAttribute(ForumConstants.PAGE_EDITABLE, new Boolean(isForumEditable));
 		request.setAttribute("title", title);
@@ -451,18 +451,16 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward viewInstructions(ActionMapping mapping,
-			ActionForm form, HttpServletRequest request,
+	private ActionForward viewInstructions(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		Long toolContentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
-		
+		Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+
 		forumService = getForumService();
 		Forum forum = forumService.getForumByContentId(toolContentID);
 		// if can not find out forum, echo back error message
 		if (forum == null) {
 			ActionErrors errors = new ActionErrors();
-			errors.add("instruction.globel", new ActionMessage(
-					"error.fail.get.forum"));
+			errors.add("instruction.globel", new ActionMessage("error.fail.get.forum"));
 			this.addErrors(request, errors);
 			return mapping.getInputForward();
 		}
@@ -483,10 +481,10 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward statistic(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		Long toolContentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
-		
+	private ActionForward statistic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+
 		forumService = getForumService();
 		Map sessionTopicsMap = new TreeMap<SessionDTO, List<MessageDTO>>(this.new SessionDTOComparator());
 		Map sessionAvaMarkMap = new HashMap();
@@ -505,34 +503,32 @@
 			for (; iter.hasNext();) {
 				MessageDTO msgDto = (MessageDTO) iter.next();
 				// get all message under this topic
-				List topicThread = forumService.getTopicThread(msgDto
-						.getMessage().getUid());
+				List topicThread = forumService.getTopicThread(msgDto.getMessage().getUid());
 				// loop all message under this topic
 				msgMarkSum = 0;
 				Iterator threadIter = topicThread.iterator();
 				for (msgNum = 0; threadIter.hasNext(); msgNum++) {
 					MessageDTO dto = (MessageDTO) threadIter.next();
-					if (dto.getMark() != null)
+					if (dto.getMark() != null) {
 						msgMarkSum += dto.getMark().floatValue();
+					}
 				}
 				// summary to total mark
 				totalMsgMarkSum += msgMarkSum;
 				// set average mark to topic message DTO for display use
-				msgDto.setMark(msgMarkSum / (float) msgNum);
+				msgDto.setMark(msgMarkSum / msgNum);
 				totalMsg += msgNum;
 			}
 
-			float averMark = totalMsg == 0 ? 0
-					: (totalMsgMarkSum / (float) totalMsg);
+			float averMark = totalMsg == 0 ? 0 : totalMsgMarkSum / totalMsg;
 
 			SessionDTO sessionDto = new SessionDTO();
 			sessionDto.setSessionID(session.getSessionId());
 			sessionDto.setSessionName(session.getSessionName());
 
 			sessionTopicsMap.put(sessionDto, topicList);
-			sessionAvaMarkMap.put(session.getSessionId(),averMark);
-			sessionTotalMsgMap.put(session.getSessionId(),
-					new Integer(totalMsg));
+			sessionAvaMarkMap.put(session.getSessionId(), averMark);
+			sessionTotalMsgMap.put(session.getSessionId(), new Integer(totalMsg));
 		}
 		request.setAttribute("topicList", sessionTopicsMap);
 		request.setAttribute("markAverage", sessionAvaMarkMap);
@@ -549,44 +545,45 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward viewTopicTree(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
+	private ActionForward viewTopicTree(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
 
 		Long rootTopicId = WebUtil.readLongParam(request, ForumConstants.ATTR_TOPIC_ID);
 		forumService = getForumService();
 		// get root topic list
 		List<MessageDTO> msgDtoList = forumService.getTopicThread(rootTopicId);
 		request.setAttribute(ForumConstants.AUTHORING_TOPIC_THREAD, msgDtoList);
-		
+
 		return mapping.findForward("success");
 	}
 
 	private ActionForward viewReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		
-		Long uid = WebUtil.readLongParam(request, ForumConstants.ATTR_USER_UID); 
-		Long sessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); 
-		
+
+		Long uid = WebUtil.readLongParam(request, ForumConstants.ATTR_USER_UID);
+		Long sessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+
 		ForumUser user = forumService.getUser(uid);
-		NotebookEntry notebookEntry = forumService.getEntry(sessionID, 
-				CoreNotebookConstants.NOTEBOOK_TOOL, 
+		NotebookEntry notebookEntry = forumService.getEntry(sessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
 				ForumConstants.TOOL_SIGNATURE, user.getUserId().intValue());
-		
+
 		ForumToolSession session = forumService.getSessionBySessionId(sessionID);
-		
+
 		UserDTO userDTO = new UserDTO(user);
-		if(notebookEntry == null){
+		if (notebookEntry == null) {
 			userDTO.setFinishReflection(false);
 			userDTO.setReflect(null);
-		}else{
+		}
+		else {
 			userDTO.setFinishReflection(true);
 			userDTO.setReflect(notebookEntry.getEntry());
 		}
 		userDTO.setReflectInstrctions(session.getForum().getReflectInstructions());
-		
+
 		request.setAttribute("userDTO", userDTO);
 		return mapping.findForward("success");
 	}
+
 	/**
 	 * View topic subject, content and attachement.
 	 * 
@@ -596,38 +593,38 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward viewTopic(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
+	private ActionForward viewTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
 
-		Long msgUid = new Long(WebUtil.readLongParam(request,
-				ForumConstants.ATTR_TOPIC_ID));
+		Long msgUid = new Long(WebUtil.readLongParam(request, ForumConstants.ATTR_TOPIC_ID));
 
 		forumService = getForumService();
 		Message topic = forumService.getMessage(msgUid);
 
-		request.setAttribute(ForumConstants.AUTHORING_TOPIC, MessageDTO
-				.getMessageDTO(topic));
+		request.setAttribute(ForumConstants.AUTHORING_TOPIC, MessageDTO.getMessageDTO(topic));
 		return mapping.findForward("success");
 	}
 
-
-
-	private ActionForward releaseMark(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+	private ActionForward releaseMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
 		//get service then update report table
 		forumService = getForumService();
-		Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
+		Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
 		forumService.releaseMarksForSession(sessionID);
+
 		try {
 			PrintWriter out = response.getWriter();
 			ForumToolSession session = forumService.getSessionBySessionId(sessionID);
 			String sessionName = "";
-			if(session != null)
+			if (session != null) {
 				sessionName = session.getSessionName();
-			out.write(getMessageService().getMessage("msg.mark.released",new String[]{sessionName}));
+			}
+			out.write(getMessageService().getMessage("msg.mark.released", new String[] { sessionName }));
 			out.flush();
-		} catch (IOException e) {
+
 		}
-		
+		catch (IOException e) {
+		}
 		return null;
 	}
 
@@ -644,19 +641,19 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward viewAllMarks(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
+	private ActionForward viewAllMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
 		//only one param for session scope marks
-		Long sessionID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
-		
+		Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
+
 		//create sessionMap
-		SessionMap<String, Object> sessionMap = new SessionMap<String,Object>();
+		SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 		sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
 		sessionMap.put(ForumConstants.PARAM_UPDATE_MODE, ForumConstants.MARK_UPDATE_FROM_SESSION);
-		
+
 		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-		
+
 		//get tool session scope topics
 		forumService = getForumService();
 		List topicList = forumService.getAllTopicsFromSession(sessionID);
@@ -665,6 +662,7 @@
 		request.setAttribute(ForumConstants.ATTR_REPORT, topicsByUser);
 		return mapping.findForward("success");
 	}
+
 	/**
 	 * View a special user's mark
 	 * 
@@ -674,33 +672,32 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward viewUserMark(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		Long userUid = new Long(WebUtil.readLongParam(request,ForumConstants.USER_UID));
-		Long sessionId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
+	private ActionForward viewUserMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		Long userUid = new Long(WebUtil.readLongParam(request, ForumConstants.USER_UID));
+		Long sessionId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
 
 		//create sessionMap
-		SessionMap<String, Object> sessionMap = new SessionMap<String,Object>();
+		SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
-		
+
 		sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
 		sessionMap.put(ForumConstants.PARAM_UPDATE_MODE, ForumConstants.MARK_UPDATE_FROM_USER);
-		
+
 		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 		//get this user's all topics
 		forumService = getForumService();
 		List<MessageDTO> messageList = forumService.getMessagesByUserUid(userUid, sessionId);
 		ForumUser user = forumService.getUser(userUid);
 
 		// each back to web page
-		Map<ForumUser,List<MessageDTO>> report = new TreeMap(this.new ForumUserComparator());
-		report.put(user,messageList);
+		Map<ForumUser, List<MessageDTO>> report = new TreeMap(this.new ForumUserComparator());
+		report.put(user, messageList);
 		request.setAttribute(ForumConstants.ATTR_REPORT, report);
-		
+
 		return mapping.findForward("success");
 	}
 
-
 	/**
 	 * Edit a special user's mark.
 	 * 
@@ -710,35 +707,37 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward editMark(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
+	private ActionForward editMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
 		MarkForm markForm = (MarkForm) form;
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(markForm.getSessionMapID());
 		String updateMode = (String) sessionMap.get(ForumConstants.PARAM_UPDATE_MODE);
 		//view forum mode
-		if(StringUtils.isBlank(updateMode)){
+		if (StringUtils.isBlank(updateMode)) {
 			sessionMap.put(ForumConstants.PARAM_UPDATE_MODE, ForumConstants.MARK_UPDATE_FROM_FORUM);
-			sessionMap.put(ForumConstants.ATTR_ROOT_TOPIC_UID,markForm.getTopicID());
+			sessionMap.put(ForumConstants.ATTR_ROOT_TOPIC_UID, markForm.getTopicID());
 		}
-		
+
 		// get Message and User from database
 		forumService = getForumService();
 		Message msg = forumService.getMessage(markForm.getTopicID());
 		ForumUser user = msg.getCreatedBy();
 
 		// echo back to web page
 		if (msg.getReport() != null) {
-			if (msg.getReport().getMark() != null)
-				markForm.setMark(NumberUtil.formatLocalisedNumber(msg.getReport().getMark(),request.getLocale(),2));
-			else
+			if (msg.getReport().getMark() != null) {
+				markForm.setMark(NumberUtil.formatLocalisedNumber(msg.getReport().getMark(), request.getLocale(), 2));
+			}
+			else {
 				markForm.setMark("");
+			}
 			markForm.setComment(msg.getReport().getComment());
 		}
-		
+
 		// each back to web page
 		request.setAttribute(ForumConstants.ATTR_TOPIC, MessageDTO.getMessageDTO(msg));
 		request.setAttribute(ForumConstants.ATTR_USER, user);
-		
+
 		// Should we show the reflection or not? We shouldn't show it when the View Forum screen is accessed
 		// from the Monitoring Summary screen, but we should when accessed from the Learner Progress screen.
 		// Need to constantly past this value on, rather than hiding just the once, as the View Forum
@@ -759,76 +758,81 @@
 	 * @param response
 	 * @return
 	 */
-	private ActionForward updateMark(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
+	private ActionForward updateMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
 		MarkForm markForm = (MarkForm) form;
-		
+
 		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, markForm.getSessionMapID());
 		String markStr = markForm.getMark();
 		Float mark = null;
-        ActionMessages errors = new ActionMessages();
-        if (StringUtils.isBlank(markStr)) {
-          ActionMessage error = new ActionMessage("error.valueReqd");
-          errors.add("report.mark", error);
-        }else {
-        	try{
-        		mark = NumberUtil.getLocalisedFloat(markStr, request.getLocale());
-        	}catch(Exception e){
-              	ActionMessage error = new ActionMessage("error.mark.invalid.number");
-            	errors.add("report.mark", error);
-        	}
-        }
-        
+		ActionMessages errors = new ActionMessages();
+		if (StringUtils.isBlank(markStr)) {
+			ActionMessage error = new ActionMessage("error.valueReqd");
+			errors.add("report.mark", error);
+		}
+		else {
+			try {
+				mark = NumberUtil.getLocalisedFloat(markStr, request.getLocale());
+			}
+			catch (Exception e) {
+				ActionMessage error = new ActionMessage("error.mark.invalid.number");
+				errors.add("report.mark", error);
+			}
+		}
+
 		forumService = getForumService();
 		// echo back to web page
 		Message msg = forumService.getMessage(markForm.getTopicID());
 		ForumUser user = msg.getCreatedBy();
-		
+
 		request.setAttribute(ForumConstants.ATTR_USER, user);
-		if(!errors.isEmpty()){
+		if (!errors.isEmpty()) {
 			// each back to web page
 			request.setAttribute(ForumConstants.ATTR_TOPIC, MessageDTO.getMessageDTO(msg));
-        	saveErrors(request, errors);
-        	return mapping.getInputForward();
-        }
+			saveErrors(request, errors);
+			return mapping.getInputForward();
+		}
 
 		//update message report
-		
+
 		forumService = getForumService();
 		ForumReport report = msg.getReport();
 		if (report == null) {
 			report = new ForumReport();
 			msg.setReport(report);
 		}
-		
+
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(markForm.getSessionMapID());
 		Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 		String updateMode = (String) sessionMap.get(ForumConstants.PARAM_UPDATE_MODE);
-		
+
 		//only session has been released mark, the data of mark release will have value.
 		ForumToolSession toolSession = forumService.getSessionBySessionId(sessionId);
-		if(toolSession.isMarkReleased())
+		if (toolSession.isMarkReleased()) {
 			report.setDateMarksReleased(new Date());
-		
+		}
+
 		report.setMark(mark);
 		report.setComment(markForm.getComment());
 		forumService.updateTopic(msg);
-		
+
 		//echo back to topic list page: it depends which screen is come from: view special user mark, or view all user marks. 
-		if(StringUtils.equals(updateMode, ForumConstants.MARK_UPDATE_FROM_SESSION)){
+		if (StringUtils.equals(updateMode, ForumConstants.MARK_UPDATE_FROM_SESSION)) {
 			List topicList = forumService.getAllTopicsFromSession(sessionId);
 			Map topicsByUser = getTopicsSortedByAuthor(topicList);
 			request.setAttribute(ForumConstants.ATTR_REPORT, topicsByUser);
 			//listMark or listAllMark.
 			return mapping.findForward("success");
-		}else if(StringUtils.equals(updateMode, ForumConstants.MARK_UPDATE_FROM_USER)){
+		}
+		else if (StringUtils.equals(updateMode, ForumConstants.MARK_UPDATE_FROM_USER)) {
 			List<MessageDTO> messageList = forumService.getMessagesByUserUid(user.getUid(), sessionId);
-			Map<ForumUser,List<MessageDTO>> topicMap = new TreeMap(this.new ForumUserComparator());
-			topicMap.put(user,messageList);
+			Map<ForumUser, List<MessageDTO>> topicMap = new TreeMap(this.new ForumUserComparator());
+			topicMap.put(user, messageList);
 			request.setAttribute(ForumConstants.ATTR_REPORT, topicMap);
 			//listMark or listAllMark.
 			return mapping.findForward("success");
-		}else{  //mark from view forum
+		}
+		else { //mark from view forum
 			return mapping.findForward("viewTopic");
 		}
 
@@ -845,11 +849,9 @@
 	 */
 	private IForumService getForumService() {
 		if (forumService == null) {
-			WebApplicationContext wac = WebApplicationContextUtils
-					.getRequiredWebApplicationContext(getServlet()
-							.getServletContext());
-			forumService = (IForumService) wac
-					.getBean(ForumConstants.FORUM_SERVICE);
+			WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
+					.getServletContext());
+			forumService = (IForumService) wac.getBean(ForumConstants.FORUM_SERVICE);
 		}
 		return forumService;
 	}
@@ -859,16 +861,17 @@
 	 * @return
 	 */
 	private Map getTopicsSortedByAuthor(List topicList) {
-		Map<ForumUser,List<MessageDTO>> topicsByUser = new TreeMap(this.new ForumUserComparator());
+		Map<ForumUser, List<MessageDTO>> topicsByUser = new TreeMap(this.new ForumUserComparator());
 		Iterator iter = topicList.iterator();
 		forumService = getForumService();
 		while (iter.hasNext()) {
 			MessageDTO dto = (MessageDTO) iter.next();
-			if(dto.getMessage().getIsAuthored())
+			if (dto.getMessage().getIsAuthored()) {
 				continue;
+			}
 			dto.getMessage().getReport();
 			ForumUser user = (ForumUser) dto.getMessage().getCreatedBy().clone();
-			List<MessageDTO> list = (List) topicsByUser.get(user);
+			List<MessageDTO> list = topicsByUser.get(user);
 			if (list == null) {
 				list = new ArrayList<MessageDTO>();
 				topicsByUser.put(user, list);
@@ -882,7 +885,7 @@
 	 * Return ResourceService bean.
 	 */
 	private MessageService getMessageService() {
-	      WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-	      return (MessageService) wac.getBean("forumMessageService");
+		WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
+		return (MessageService) wac.getBean("forumMessageService");
 	}
 }
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -rdba3e6022ca1e0478e053c415095b14db37576c7 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision dba3e6022ca1e0478e053c415095b14db37576c7)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -22,13 +22,13 @@
       type="org.lamsfoundation.lams.tool.forum.web.forms.MarkForm"
     />
     <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="messageForm"
+      type="org.lamsfoundation.lams.tool.forum.web.forms.MessageForm"
+    />
 
    <form-bean name="emptyForm" type="org.apache.struts.action.DynaActionForm" />
 
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
diff -u -r1977f2d6d4038839d28238041d7e5cd4dfd35036 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision 1977f2d6d4038839d28238041d7e5cd4dfd35036)
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -51,6 +51,15 @@
 </p>
 
 <p>
+	<html:checkbox property="forum.notifyLearnersOnMarkRelease" styleId="notifyLearnersOnMarkRelease"
+		styleClass="noBorder">
+	</html:checkbox>
+	<label for="notifyLearnersOnMarkRelease">
+		<fmt:message key="label.authoring.advanced.notify.mark.release" />
+	</label>
+</p>
+
+<p>
 	<html:checkbox property="forum.reflectOnActivity" styleClass="noBorder"	styleId="reflectOn">
 	</html:checkbox>
 	<label for="reflectOn">
Index: lams_tool_forum/web/jsps/monitoring/summary.jsp
===================================================================
diff -u -rb011786cc660c7861944698562681008be671915 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_forum/web/jsps/monitoring/summary.jsp	(.../summary.jsp)	(revision b011786cc660c7861944698562681008be671915)
+++ lams_tool_forum/web/jsps/monitoring/summary.jsp	(.../summary.jsp)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -194,6 +194,23 @@
 	
 	<tr>
 		<td>
+			<fmt:message key="label.authoring.advanced.notify.mark.release" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${forum.notifyLearnersOnMarkRelease == true}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
 			<fmt:message key="monitor.summary.td.addNotebook" />
 		</td>
 		
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
===================================================================
diff -u -r8b51e7543717ab3982989e3dd3662c88e192426f -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision 8b51e7543717ab3982989e3dd3662c88e192426f)
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -174,6 +174,14 @@
             column="updated"
         />
 
+        <property
+            name="notifyLearnersOnMarkRelease"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="mark_release_notify"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-SubmitFilesContent.xml
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rb93c0a14919af5bff7e1a99168c91f4057799c51 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b93c0a14919af5bff7e1a99168c91f4057799c51)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -137,5 +137,8 @@
 monitor.summary.td.addNotebook  =Add Notebook at the end of Submit
 monitor.summary.td.notebookInstructions  =Notebook instructions
 
-
+label.authoring.advanced.notify.mark.release=Notify learners when marks are released
+event.mark.release.subject=LAMS: Marks were released
+event.mark.release.body=A teacher released marks in a Submit Files activity in LAMS.\nYour marks are:\n\n{0}\nThis message was send automatically, please do not reply to it.
+event.mark.release.mark=For the file named "{0}" submitted on {1} the mark is {2}\n
 #======= End labels: Exported 130 labels for en AU =====
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rb93c0a14919af5bff7e1a99168c91f4057799c51 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision b93c0a14919af5bff7e1a99168c91f4057799c51)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -137,5 +137,8 @@
 monitor.summary.td.addNotebook  =Add Notebook at the end of Submit
 monitor.summary.td.notebookInstructions  =Notebook instructions
 
-
+label.authoring.advanced.notify.mark.release=Notify learners when marks are released
+event.mark.release.subject=LAMS: Marks were releasedevent.
+event.mark.release.body=A teacher released marks in a Submit Files activity in LAMS.\nYour marks are:\n\n{0}\nThis message was send automatically, please do not reply to it.
+event.mark.release.mark=For the file named "{0}" submitted on {1} the mark is {2}\n
 #======= End labels: Exported 130 labels for en AU =====
Index: lams_tool_sbmt/db/model/lams_tool_sbmt.clay
===================================================================
diff -u -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/db/model/lams_tool_sbmt.clay	(.../lams_tool_sbmt.clay)	(revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
+++ lams_tool_sbmt/db/model/lams_tool_sbmt.clay	(.../lams_tool_sbmt.clay)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -1,557 +1,570 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<clay-model clay-version="1.4.0">
-<database-model alias="" author="" begin-script="" end-script="" name="lams_tool_sbmt" remarks="" sql-dialect-id="jp.azzurri.clay.dialect.MySQL_4_0_Dialect" uid="935d0:119cae91b03:-8000" version="1.0">
-<database-model-description></database-model-description>
-<schema-list>
-<schema alias="" name="DEFAULT_SCHEMA" remarks="" uid="935d0:119cae91b03:-7fff">
-<schema-description></schema-description>
-<domain-list/>
-<table-list>
-<table alias="" name="tl_lasbmt11_content" remarks="" uid="935d0:119cae91b03:-7ffe">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="10" y="10"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="0" mandatory="true" name="content_id" remarks="" uid="935d0:119cae91b03:-7ffc">
-<column-description></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="64" decimal-digits="0" default-value="" mandatory="true" name="title" remarks="" uid="935d0:119cae91b03:-7ffb">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="instruction" remarks="" uid="935d0:119cae91b03:-7ffa">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="0" mandatory="true" name="define_later" remarks="" uid="935d0:119cae91b03:-7ff9">
-<column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="0" mandatory="true" name="run_offline" remarks="" uid="935d0:119cae91b03:-7ff8">
-<column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="offline_instruction" remarks="" uid="935d0:119cae91b03:-7ff7">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="online_instruction" remarks="" uid="935d0:119cae91b03:-7ff6">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="run_offline_instruction" remarks="" uid="935d0:119cae91b03:-7ff5">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="content_in_use" remarks="" uid="935d0:119cae91b03:-7ff4">
-<column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="lock_on_finished" remarks="" uid="935d0:119cae91b03:-7ff3">
-<column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7ffd">
-<primary-key-description></primary-key-description>
-<primary-key-column name="content_id"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list>
-<index alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7ff2" unique="false">
-<index-description></index-description>
-<index-column name="content_id" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="tl_lasbmt11_instruction_files" remarks="" uid="935d0:119cae91b03:-7ff1">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="30" y="263"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="file_id" remarks="" uid="935d0:119cae91b03:-7fef">
-<column-description></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="false" name="uuid" remarks="" uid="935d0:119cae91b03:-7fee">
-<column-description></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="false" name="version_id" remarks="" uid="935d0:119cae91b03:-7fed">
-<column-description></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="false" name="type" remarks="" uid="935d0:119cae91b03:-7fec">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="name" remarks="" uid="935d0:119cae91b03:-7feb">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="content_id" remarks="" uid="935d0:119cae91b03:-7fea">
-<column-description></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="PRIMARY" remarks="" uid="935d0:119cae91b03:-7ff0">
-<primary-key-description></primary-key-description>
-<primary-key-column name="file_id"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FKA75538F9FC4BEA1" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lasbmt11_content" 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="935d0:119cae91b03:-7fc4">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="content_id" referenced-key-column-name="content_id"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fe9" unique="false">
-<index-description></index-description>
-<index-column name="file_id" sort="ASC"/>
-</index>
-<index alias="" name="FKA75538F9FC4BEA1" remarks="" uid="935d0:119cae91b03:-7fe8" unique="true">
-<index-description></index-description>
-<index-column name="content_id" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="tl_lasbmt11_report" remarks="" uid="935d0:119cae91b03:-7fe7">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="304" y="168"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="report_id" remarks="" uid="935d0:119cae91b03:-7fe5">
-<column-description></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="250" decimal-digits="0" default-value="" mandatory="false" name="comments" remarks="" uid="935d0:119cae91b03:-7fe4">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="marks" remarks="" uid="935d0:119cae91b03:-7fe3">
-<column-description></column-description>
-<data-type jdbc-type="7" name="FLOAT" selected-variant-pattern="FLOAT">
-<variant type-name-pattern="FLOAT"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="FLOAT(%n)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="FLOAT(%n) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="FLOAT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="FLOAT(%n) ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="FLOAT(%p, %s)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="FLOAT(%p, %s) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="FLOAT(%p, %s) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="FLOAT(%p, %s) ZEROFILL"/>
-<variant type-name-pattern="FLOAT UNSIGNED"/>
-<variant type-name-pattern="FLOAT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="FLOAT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="19" decimal-digits="0" default-value="" mandatory="false" name="date_marks_released" remarks="" uid="935d0:119cae91b03:-7fe2">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
-<variant type-name-pattern="DATETIME"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fe6">
-<primary-key-description></primary-key-description>
-<primary-key-column name="report_id"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list>
-<index alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fe1" unique="false">
-<index-description></index-description>
-<index-column name="report_id" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="tl_lasbmt11_session" remarks="" uid="935d0:119cae91b03:-7fe0">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="629" y="9"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="session_id" remarks="" uid="935d0:119cae91b03:-7fde">
-<column-description></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="11" decimal-digits="0" default-value="0" mandatory="true" name="status" remarks="" uid="935d0:119cae91b03:-7fdd">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INT" selected-variant-pattern="INT(%n)">
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n)"/>
-<variant type-name-pattern="INT"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) ZEROFILL"/>
-<variant type-name-pattern="INT UNSIGNED"/>
-<variant type-name-pattern="INT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="content_id" remarks="" uid="935d0:119cae91b03:-7fdc">
-<column-description></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="250" decimal-digits="0" default-value="" mandatory="false" name="session_name" remarks="" uid="935d0:119cae91b03:-7fdb">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fdf">
-<primary-key-description></primary-key-description>
-<primary-key-column name="session_id"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FKEC8C77C9FC4BEA1" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lasbmt11_content" 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="935d0:119cae91b03:-7fc3">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="content_id" referenced-key-column-name="content_id"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fda" unique="false">
-<index-description></index-description>
-<index-column name="session_id" sort="ASC"/>
-</index>
-<index alias="" name="FKEC8C77C9FC4BEA1" remarks="" uid="935d0:119cae91b03:-7fd9" unique="true">
-<index-description></index-description>
-<index-column name="content_id" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="tl_lasbmt11_session_learners" remarks="" uid="935d0:119cae91b03:-7fd8">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="241" y="337"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="learner_id" remarks="" uid="935d0:119cae91b03:-7fd6">
-<column-description></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="false" name="user_id" remarks="" uid="935d0:119cae91b03:-7fd5">
-<column-description></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="1" decimal-digits="0" default-value="" mandatory="false" name="finished" remarks="" uid="935d0:119cae91b03:-7fd4">
-<column-description></column-description>
-<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
-<variant type-name-pattern="TINYINT"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
-<variant type-name-pattern="TINYINT UNSIGNED"/>
-<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="TINYINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="session_id" remarks="" uid="935d0:119cae91b03:-7fd3">
-<column-description></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="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fd7">
-<primary-key-description></primary-key-description>
-<primary-key-column name="learner_id"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list>
-<index alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fd2" unique="false">
-<index-description></index-description>
-<index-column name="learner_id" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="tl_lasbmt11_submission_details" remarks="" uid="935d0:119cae91b03:-7fd1">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="641" y="290"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="submission_id" remarks="" uid="935d0:119cae91b03:-7fcf">
-<column-description></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="250" decimal-digits="0" default-value="" mandatory="false" name="filePath" remarks="" uid="935d0:119cae91b03:-7fce">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="250" decimal-digits="0" default-value="" mandatory="false" name="fileDescription" remarks="" uid="935d0:119cae91b03:-7fcd">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="19" decimal-digits="0" default-value="" mandatory="false" name="date_of_submission" remarks="" uid="935d0:119cae91b03:-7fcc">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
-<variant type-name-pattern="DATETIME"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="uuid" remarks="" uid="935d0:119cae91b03:-7fcb">
-<column-description></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="false" name="version_id" remarks="" uid="935d0:119cae91b03:-7fca">
-<column-description></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="false" name="session_id" remarks="" uid="935d0:119cae91b03:-7fc9">
-<column-description></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="false" name="learner_id" remarks="" uid="935d0:119cae91b03:-7fc8">
-<column-description></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="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fd0">
-<primary-key-description></primary-key-description>
-<primary-key-column name="submission_id"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK1411A53C3A4D8629" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lasbmt11_session_learners" 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="935d0:119cae91b03:-7fc2">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="learner_id" referenced-key-column-name="learner_id"/>
-</foreign-key>
-<foreign-key alias="" name="FK1411A53C630DDF64" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lasbmt11_session" 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="935d0:119cae91b03:-7fc1">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="session_id" referenced-key-column-name="session_id"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fc7" unique="false">
-<index-description></index-description>
-<index-column name="submission_id" sort="ASC"/>
-</index>
-<index alias="" name="FK1411A53C630DDF64" remarks="" uid="935d0:119cae91b03:-7fc6" unique="true">
-<index-description></index-description>
-<index-column name="session_id" sort="ASC"/>
-</index>
-<index alias="" name="FK1411A53C3A4D8629" remarks="" uid="935d0:119cae91b03:-7fc5" unique="true">
-<index-description></index-description>
-<index-column name="learner_id" sort="ASC"/>
-</index>
-</index-list>
-</table>
-</table-list>
-</schema>
-</schema-list>
-</database-model>
-</clay-model>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<clay-model clay-version="1.4.2">
+<database-model alias="" author="" begin-script="" end-script="" name="lams_tool_sbmt" remarks="" sql-dialect-id="jp.azzurri.clay.dialect.MySQL_4_0_Dialect" uid="935d0:119cae91b03:-8000" version="1.0">
+<database-model-description/>
+<schema-list>
+<schema alias="" name="DEFAULT_SCHEMA" remarks="" uid="935d0:119cae91b03:-7fff">
+<schema-description/>
+<domain-list/>
+<table-list>
+<table alias="" name="tl_lasbmt11_content" remarks="" uid="935d0:119cae91b03:-7ffe">
+<table-description/>
+<table-figure-bounds height="172" width="184" x="10" y="10"/>
+<column-list>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="0" mandatory="true" name="content_id" remarks="" uid="935d0:119cae91b03:-7ffc">
+<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="64" decimal-digits="0" default-value="" mandatory="true" name="title" remarks="" uid="935d0:119cae91b03:-7ffb">
+<column-description/>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="instruction" remarks="" uid="935d0:119cae91b03:-7ffa">
+<column-description/>
+<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
+<variant type-name-pattern="TEXT"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="0" mandatory="true" name="define_later" remarks="" uid="935d0:119cae91b03:-7ff9">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="0" mandatory="true" name="run_offline" remarks="" uid="935d0:119cae91b03:-7ff8">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="offline_instruction" remarks="" uid="935d0:119cae91b03:-7ff7">
+<column-description/>
+<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
+<variant type-name-pattern="TEXT"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="online_instruction" remarks="" uid="935d0:119cae91b03:-7ff6">
+<column-description/>
+<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
+<variant type-name-pattern="TEXT"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="65535" decimal-digits="0" default-value="" mandatory="false" name="run_offline_instruction" remarks="" uid="935d0:119cae91b03:-7ff5">
+<column-description/>
+<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
+<variant type-name-pattern="TEXT"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="content_in_use" remarks="" uid="935d0:119cae91b03:-7ff4">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="false" name="lock_on_finished" remarks="" uid="935d0:119cae91b03:-7ff3">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="false" name="mark_release_notify" remarks="" uid="42f3a9:11c2093dbc4:-7ff8">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT">
+<variant type-name-pattern="TINYINT"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+</data-type>
+</column>
+</column-list>
+<primary-key alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7ffd">
+<primary-key-description/>
+<primary-key-column name="content_id"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list/>
+<index-list>
+<index alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7ff2" unique="false">
+<index-description/>
+<index-column name="content_id" sort="ASC"/>
+</index>
+</index-list>
+</table>
+<table alias="" name="tl_lasbmt11_instruction_files" remarks="" uid="935d0:119cae91b03:-7ff1">
+<table-description/>
+<table-figure-bounds height="-1" width="-1" x="30" y="263"/>
+<column-list>
+<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="file_id" remarks="" uid="935d0:119cae91b03:-7fef">
+<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="false" name="uuid" remarks="" uid="935d0:119cae91b03:-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="false" name="version_id" remarks="" uid="935d0:119cae91b03:-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 alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="type" remarks="" uid="935d0:119cae91b03:-7fec">
+<column-description/>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="name" remarks="" uid="935d0:119cae91b03:-7feb">
+<column-description/>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="content_id" remarks="" uid="935d0:119cae91b03:-7fea">
+<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="PRIMARY" remarks="" uid="935d0:119cae91b03:-7ff0">
+<primary-key-description/>
+<primary-key-column name="file_id"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list>
+<foreign-key alias="" name="FKA75538F9FC4BEA1" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lasbmt11_content" 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="935d0:119cae91b03:-7fc4">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="content_id" referenced-key-column-name="content_id"/>
+</foreign-key>
+</foreign-key-list>
+<index-list>
+<index alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fe9" unique="false">
+<index-description/>
+<index-column name="file_id" sort="ASC"/>
+</index>
+<index alias="" name="FKA75538F9FC4BEA1" remarks="" uid="935d0:119cae91b03:-7fe8" unique="true">
+<index-description/>
+<index-column name="content_id" sort="ASC"/>
+</index>
+</index-list>
+</table>
+<table alias="" name="tl_lasbmt11_report" remarks="" uid="935d0:119cae91b03:-7fe7">
+<table-description/>
+<table-figure-bounds height="-1" width="-1" x="304" y="168"/>
+<column-list>
+<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="report_id" remarks="" uid="935d0:119cae91b03:-7fe5">
+<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="250" decimal-digits="0" default-value="" mandatory="false" name="comments" remarks="" uid="935d0:119cae91b03:-7fe4">
+<column-description/>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="marks" remarks="" uid="935d0:119cae91b03:-7fe3">
+<column-description/>
+<data-type jdbc-type="7" name="FLOAT" selected-variant-pattern="FLOAT">
+<variant type-name-pattern="FLOAT"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="FLOAT(%n)"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="FLOAT(%n) UNSIGNED"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="FLOAT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="FLOAT(%n) ZEROFILL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="FLOAT(%p, %s)"/>
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="FLOAT(%p, %s) UNSIGNED"/>
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="FLOAT(%p, %s) UNSIGNED ZEROFILL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="FLOAT(%p, %s) ZEROFILL"/>
+<variant type-name-pattern="FLOAT UNSIGNED"/>
+<variant type-name-pattern="FLOAT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="FLOAT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="19" decimal-digits="0" default-value="" mandatory="false" name="date_marks_released" remarks="" uid="935d0:119cae91b03:-7fe2">
+<column-description/>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
+<variant type-name-pattern="DATETIME"/>
+</data-type>
+</column>
+</column-list>
+<primary-key alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fe6">
+<primary-key-description/>
+<primary-key-column name="report_id"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list/>
+<index-list>
+<index alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fe1" unique="false">
+<index-description/>
+<index-column name="report_id" sort="ASC"/>
+</index>
+</index-list>
+</table>
+<table alias="" name="tl_lasbmt11_session" remarks="" uid="935d0:119cae91b03:-7fe0">
+<table-description/>
+<table-figure-bounds height="-1" width="-1" x="629" y="9"/>
+<column-list>
+<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="session_id" remarks="" uid="935d0:119cae91b03:-7fde">
+<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="11" decimal-digits="0" default-value="0" mandatory="true" name="status" remarks="" uid="935d0:119cae91b03:-7fdd">
+<column-description/>
+<data-type jdbc-type="4" name="INT" selected-variant-pattern="INT(%n)">
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n)"/>
+<variant type-name-pattern="INT"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INT(%n) ZEROFILL"/>
+<variant type-name-pattern="INT UNSIGNED"/>
+<variant type-name-pattern="INT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="INT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="content_id" remarks="" uid="935d0:119cae91b03:-7fdc">
+<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="250" decimal-digits="0" default-value="" mandatory="false" name="session_name" remarks="" uid="935d0:119cae91b03:-7fdb">
+<column-description/>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+</column-list>
+<primary-key alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fdf">
+<primary-key-description/>
+<primary-key-column name="session_id"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list>
+<foreign-key alias="" name="FKEC8C77C9FC4BEA1" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lasbmt11_content" 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="935d0:119cae91b03:-7fc3">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="content_id" referenced-key-column-name="content_id"/>
+</foreign-key>
+</foreign-key-list>
+<index-list>
+<index alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fda" unique="false">
+<index-description/>
+<index-column name="session_id" sort="ASC"/>
+</index>
+<index alias="" name="FKEC8C77C9FC4BEA1" remarks="" uid="935d0:119cae91b03:-7fd9" unique="true">
+<index-description/>
+<index-column name="content_id" sort="ASC"/>
+</index>
+</index-list>
+</table>
+<table alias="" name="tl_lasbmt11_session_learners" remarks="" uid="935d0:119cae91b03:-7fd8">
+<table-description/>
+<table-figure-bounds height="-1" width="-1" x="241" y="337"/>
+<column-list>
+<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="learner_id" remarks="" uid="935d0:119cae91b03:-7fd6">
+<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="false" name="user_id" remarks="" uid="935d0:119cae91b03:-7fd5">
+<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="1" decimal-digits="0" default-value="" mandatory="false" name="finished" remarks="" uid="935d0:119cae91b03:-7fd4">
+<column-description/>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="session_id" remarks="" uid="935d0:119cae91b03:-7fd3">
+<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="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fd7">
+<primary-key-description/>
+<primary-key-column name="learner_id"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list/>
+<index-list>
+<index alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fd2" unique="false">
+<index-description/>
+<index-column name="learner_id" sort="ASC"/>
+</index>
+</index-list>
+</table>
+<table alias="" name="tl_lasbmt11_submission_details" remarks="" uid="935d0:119cae91b03:-7fd1">
+<table-description/>
+<table-figure-bounds height="-1" width="-1" x="641" y="290"/>
+<column-list>
+<column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="submission_id" remarks="" uid="935d0:119cae91b03:-7fcf">
+<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="250" decimal-digits="0" default-value="" mandatory="false" name="filePath" remarks="" uid="935d0:119cae91b03:-7fce">
+<column-description/>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="250" decimal-digits="0" default-value="" mandatory="false" name="fileDescription" remarks="" uid="935d0:119cae91b03:-7fcd">
+<column-description/>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="19" decimal-digits="0" default-value="" mandatory="false" name="date_of_submission" remarks="" uid="935d0:119cae91b03:-7fcc">
+<column-description/>
+<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="DATETIME" selected-variant-pattern="DATETIME">
+<variant type-name-pattern="DATETIME"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="20" decimal-digits="0" default-value="" mandatory="false" name="uuid" remarks="" uid="935d0:119cae91b03:-7fcb">
+<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="false" name="version_id" remarks="" uid="935d0:119cae91b03:-7fca">
+<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="false" name="session_id" remarks="" uid="935d0:119cae91b03:-7fc9">
+<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="false" name="learner_id" remarks="" uid="935d0:119cae91b03:-7fc8">
+<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="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fd0">
+<primary-key-description/>
+<primary-key-column name="submission_id"/>
+</primary-key>
+<unique-key-list/>
+<foreign-key-list>
+<foreign-key alias="" name="FK1411A53C3A4D8629" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lasbmt11_session_learners" 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="935d0:119cae91b03:-7fc2">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="learner_id" referenced-key-column-name="learner_id"/>
+</foreign-key>
+<foreign-key alias="" name="FK1411A53C630DDF64" on-delete="NO ACTION" on-update="NO ACTION" referenced-key="PRIMARY" referenced-table="tl_lasbmt11_session" 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="935d0:119cae91b03:-7fc1">
+<foreign-key-description/>
+<foreign-key-figure>
+<fk-fig-bendpoint-list/>
+</foreign-key-figure>
+<foreign-key-column column-name="session_id" referenced-key-column-name="session_id"/>
+</foreign-key>
+</foreign-key-list>
+<index-list>
+<index alias="" name="PRIMARY" remarks="" uid="935d0:119cae91b03:-7fc7" unique="false">
+<index-description/>
+<index-column name="submission_id" sort="ASC"/>
+</index>
+<index alias="" name="FK1411A53C630DDF64" remarks="" uid="935d0:119cae91b03:-7fc6" unique="true">
+<index-description/>
+<index-column name="session_id" sort="ASC"/>
+</index>
+<index alias="" name="FK1411A53C3A4D8629" remarks="" uid="935d0:119cae91b03:-7fc5" unique="true">
+<index-description/>
+<index-column name="learner_id" sort="ASC"/>
+</index>
+</index-list>
+</table>
+</table-list>
+</schema>
+</schema-list>
+</database-model>
+</clay-model>
Index: lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql
===================================================================
diff -u -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	(.../create_lams_tool_sbmt.sql)	(revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
+++ lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	(.../create_lams_tool_sbmt.sql)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -24,6 +24,7 @@
    created datetime, 
    created_by bigint, 
    updated datetime,
+   mark_release_notify tinyint DEFAULT 0,
    primary key (content_id)
 )TYPE=InnoDB;
 create table tl_lasbmt11_user (
Index: lams_tool_sbmt/db/sql/table-schema.sql
===================================================================
diff -u -re7f9f5772bf6f3cf2786a65e78d7de441d348c37 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/db/sql/table-schema.sql	(.../table-schema.sql)	(revision e7f9f5772bf6f3cf2786a65e78d7de441d348c37)
+++ lams_tool_sbmt/db/sql/table-schema.sql	(.../table-schema.sql)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -9,9 +9,9 @@
 drop table if exists tl_lasbmt11_session;
 drop table if exists tl_lasbmt11_submission_details;
 drop table if exists tl_lasbmt11_user;
-create table tl_lasbmt11_content (content_id bigint not null, title varchar(64) not null, instruction text, define_later bit not null, run_offline bit not null, offline_instruction text, online_instruction text, content_in_use bit, lock_on_finished bit, reflect_instructions varchar(255), reflect_on_activity bit, limit_upload bit, limit_upload_number integer, created datetime, created_by bigint, updated datetime, primary key (content_id));
+create table tl_lasbmt11_content (content_id bigint not null, title varchar(64) not null, instruction text, define_later bit not null, run_offline bit not null, offline_instruction text, online_instruction text, content_in_use bit, lock_on_finished bit, reflect_instructions varchar(255), reflect_on_activity bit, limit_upload bit, limit_upload_number integer, created datetime, created_by bigint, updated datetime, mark_release_notify bit, primary key (content_id));
 create table tl_lasbmt11_instruction_files (uid bigint not null auto_increment, uuid bigint, version_id bigint, type varchar(20), name varchar(255), content_id bigint, primary key (uid));
-create table tl_lasbmt11_report (report_id bigint not null auto_increment, comments varchar(250), marks bigint, date_marks_released datetime, primary key (report_id));
+create table tl_lasbmt11_report (report_id bigint not null auto_increment, comments varchar(250), marks float, date_marks_released datetime, primary key (report_id));
 create table tl_lasbmt11_session (session_id bigint not null, status integer not null, content_id bigint, session_name varchar(250), primary key (session_id));
 create table tl_lasbmt11_submission_details (submission_id bigint not null auto_increment, filePath varchar(250), fileDescription varchar(250), date_of_submission datetime, uuid bigint, version_id bigint, session_id bigint, learner_id bigint, primary key (submission_id));
 create table tl_lasbmt11_user (uid bigint not null auto_increment, user_id integer, finished bit, session_id bigint, first_name varchar(255), login_name varchar(255), last_name varchar(255), content_id bigint, primary key (uid));
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
===================================================================
diff -u -r8b51e7543717ab3982989e3dd3662c88e192426f -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision 8b51e7543717ab3982989e3dd3662c88e192426f)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	(.../SubmitFilesContent.hbm.xml)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -174,6 +174,14 @@
             column="updated"
         />
 
+        <property
+            name="notifyLearnersOnMarkRelease"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="mark_release_notify"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-SubmitFilesContent.xml
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java
===================================================================
diff -u -r6469a3c8ad3e545e2f1929947d3c46b040896632 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	(.../SubmitFilesContent.java)	(revision 6469a3c8ad3e545e2f1929947d3c46b040896632)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	(.../SubmitFilesContent.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -21,7 +21,7 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.sbmt;
 
 import java.io.Serializable;
@@ -34,55 +34,62 @@
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.contentrepository.ItemNotFoundException;
-import org.lamsfoundation.lams.contentrepository.NodeKey;
-import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 
-
 /**
  * @hibernate.class table="tl_lasbmt11_content"
  * @serial 9072799761861936838L
  */
-public class SubmitFilesContent implements Serializable,Cloneable {
+public class SubmitFilesContent implements Serializable, Cloneable {
 
 	private static final long serialVersionUID = 9072799761861936838L;
 
 	private static Logger log = Logger.getLogger(SubmitFilesContent.class);
+
 	/** identifier field */
 	private Long contentID;
 
 	/** persistent field */
 	//basic tab fields
 	private String title;
+
 	private String instruction;
-	
+
 	// advance tab fields
 	private boolean lockOnFinished;
-	
+
+	private boolean notifyLearnersOnMarkRelease;
+
 	//instruction tab fields
 	private String offlineInstruction;
+
 	private String onlineInstruction;
+
 	private Set instructionFiles;
-	
+
 	//system level fields
 	private boolean defineLater;
+
 	private boolean runOffline;
+
 	private boolean contentInUse;
 
 	private boolean limitUpload;
+
 	private int limitUploadNumber;
-	
+
 	private boolean reflectOnActivity;
+
 	private String reflectInstructions;
-	
+
 	private Date created;
+
 	private Date updated;
+
 	private SubmitUser createdBy;
-	
+
 	//temporary fields
 	private IToolContentHandler toolContentHandler;
-	
 
 	/** default constructor */
 	public SubmitFilesContent() {
@@ -96,9 +103,9 @@
 	 * @param toolContentHandler 
 	 * @return SubmitFilesContent The new SubmitFilesContent object
 	 */
-	public static SubmitFilesContent newInstance(SubmitFilesContent content,
-			Long newContentID, IToolContentHandler toolContentHandler) {
-		content.toolContentHandler  = toolContentHandler;
+	public static SubmitFilesContent newInstance(SubmitFilesContent content, Long newContentID,
+			IToolContentHandler toolContentHandler) {
+		content.toolContentHandler = toolContentHandler;
 		SubmitFilesContent newContent = (SubmitFilesContent) content.clone();
 		newContent.setContentID(newContentID);
 		return newContent;
@@ -110,7 +117,7 @@
 	 *               column="content_id"
 	 */
 	public Long getContentID() {
-		return this.contentID;
+		return contentID;
 	}
 
 	public void setContentID(Long contentID) {
@@ -121,7 +128,7 @@
 	 * @hibernate.property column="title" length="64" not-null="true"
 	 */
 	public String getTitle() {
-		return this.title;
+		return title;
 	}
 
 	public void setTitle(String title) {
@@ -132,65 +139,61 @@
 	 * @hibernate.property column="instruction" type="text"
 	 */
 	public String getInstruction() {
-		return this.instruction;
+		return instruction;
 	}
 
 	public void setInstruction(String instructions) {
-		this.instruction = instructions;
-	}	
+		instruction = instructions;
+	}
 
+	@Override
 	public String toString() {
-		return new ToStringBuilder(this).append("contentID", getContentID())
-				.append("title", getTitle()).append("instructions",
-						getInstruction()).toString();
+		return new ToStringBuilder(this).append("contentID", getContentID()).append("title", getTitle()).append("instructions",
+				getInstruction()).toString();
 	}
 
+	@Override
 	public boolean equals(Object other) {
-		if ((this == other))
+		if (this == other) {
 			return true;
-		if (!(other instanceof SubmitFilesContent))
+		}
+		if (!(other instanceof SubmitFilesContent)) {
 			return false;
+		}
 		SubmitFilesContent castOther = (SubmitFilesContent) other;
-		return new EqualsBuilder().append(this.getContentID(),
-				castOther.getContentID()).append(this.getTitle(),
-				castOther.getTitle()).append(this.getInstruction(),
-				castOther.getInstruction()).isEquals();
+		return new EqualsBuilder().append(this.getContentID(), castOther.getContentID()).append(this.getTitle(),
+				castOther.getTitle()).append(this.getInstruction(), castOther.getInstruction()).isEquals();
 	}
 
+	@Override
 	public int hashCode() {
-		return new HashCodeBuilder().append(getContentID()).append(getTitle())
-				.append(getInstruction()).toHashCode();
+		return new HashCodeBuilder().append(getContentID()).append(getTitle()).append(getInstruction()).toHashCode();
 	}
 
+	/** 
+	 * @hibernate.property column="define_later" length="1"
+	 *  not-null="true"
+	 */
+	public boolean isDefineLater() {
+		return defineLater;
+	}
 
-    /** 
-     * @hibernate.property column="define_later" length="1"
-     *  not-null="true"
-     */
-    public boolean isDefineLater()
-    {
-        return this.defineLater;
-    }
+	public void setDefineLater(boolean defineLater) {
+		this.defineLater = defineLater;
+	}
 
-    public void setDefineLater(boolean defineLater)
-    {
-        this.defineLater = defineLater;
-    }
+	/** 
+	 * @hibernate.property column="run_offline" length="1"
+	 * not-null="true"
+	 */
+	public boolean isRunOffline() {
+		return runOffline;
+	}
 
-    /** 
-     * @hibernate.property column="run_offline" length="1"
-     * not-null="true"
-     */
-    public boolean isRunOffline()
-    {
-        return this.runOffline;
-    }
+	public void setRunOffline(boolean runOffline) {
+		this.runOffline = runOffline;
+	}
 
-    public void setRunOffline(boolean runOffline)
-    {
-        this.runOffline = runOffline;
-    }
-
 	/**
 	 * @hibernate.property column="offline_instruction" type="text"
 	 * @return Returns the offlineInstruction.
@@ -237,7 +240,7 @@
 	}
 
 	/**
- 	 * @hibernate.set lazy="true" inverse="false" cascade="all"
+	 * @hibernate.set lazy="true" inverse="false" cascade="all"
 	 * @hibernate.collection-key column="content_id"
 	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.sbmt.InstructionFiles"
 	 * 
@@ -270,32 +273,33 @@
 		this.lockOnFinished = lockOnFinished;
 	}
 
-    
-    public Object clone(){
+	@Override
+	public Object clone() {
 		Object obj = null;
 		try {
 			obj = super.clone();
 			//never clone key!
-			((SubmitFilesContent)obj).setContentID(null);
+			((SubmitFilesContent) obj).setContentID(null);
 			//clone InstructionFiles object
-			if(instructionFiles != null ){
+			if (instructionFiles != null) {
 				Iterator iter = instructionFiles.iterator();
 				Set set = new HashSet();
-				while(iter.hasNext()){
-					InstructionFiles file = (InstructionFiles)iter.next();
+				while (iter.hasNext()) {
+					InstructionFiles file = (InstructionFiles) iter.next();
 					InstructionFiles newFile = (InstructionFiles) file.clone();
 					set.add(newFile);
 				}
-				((SubmitFilesContent)obj).instructionFiles= set;
-				
-				if(this.createdBy != null){
-					((SubmitFilesContent)obj).setCreatedBy((SubmitUser) this.createdBy.clone());
-	  			}
+				((SubmitFilesContent) obj).instructionFiles = set;
+
+				if (createdBy != null) {
+					((SubmitFilesContent) obj).setCreatedBy((SubmitUser) createdBy.clone());
+				}
 			}
-		} catch (CloneNotSupportedException e) {
-			log.error("When clone " + SubmitFilesContent.class + " failed");
 		}
-		
+		catch (CloneNotSupportedException e) {
+			SubmitFilesContent.log.error("When clone " + SubmitFilesContent.class + " failed");
+		}
+
 		return obj;
 	}
 
@@ -306,31 +310,35 @@
 	public void setToolContentHandler(IToolContentHandler toolContentHandler) {
 		this.toolContentHandler = toolContentHandler;
 	}
+
 	/**
 	 * @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="limit_upload"
 	 * @return
-	 */		
+	 */
 	public boolean isLimitUpload() {
 		return limitUpload;
 	}
@@ -342,46 +350,61 @@
 	/**
 	 * @hibernate.property column="limit_upload_number"
 	 * @return
-	 */		
+	 */
 	public int getLimitUploadNumber() {
 		return limitUploadNumber;
 	}
 
 	public void setLimitUploadNumber(int limitUploadNumber) {
 		this.limitUploadNumber = limitUploadNumber;
 	}
+
 	/**
 	 * @hibernate.property column="created"
 	 * @return
-	 */		
+	 */
 	public Date getCreated() {
 		return created;
 	}
 
 	public void setCreated(Date created) {
 		this.created = created;
 	}
+
 	/**
 	 * @hibernate.many-to-one  column="created_by" cascade="none"
 	 *  
 	 * @return
-	 */		
+	 */
 	public SubmitUser getCreatedBy() {
 		return createdBy;
 	}
 
 	public void setCreatedBy(SubmitUser createdBy) {
 		this.createdBy = createdBy;
 	}
+
 	/**
 	 * @hibernate.property column="updated"
 	 * @return
-	 */		
+	 */
 	public Date getUpdated() {
 		return updated;
 	}
 
 	public void setUpdated(Date updated) {
 		this.updated = updated;
 	}
+
+	/**
+	 * @hibernate.property column="mark_release_notify"
+	 * @return
+	 */
+	public boolean isNotifyLearnersOnMarkRelease() {
+		return notifyLearnersOnMarkRelease;
+	}
+
+	public void setNotifyLearnersOnMarkRelease(boolean notifyLearnersOnMarkRelease) {
+		this.notifyLearnersOnMarkRelease = notifyLearnersOnMarkRelease;
+	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java
===================================================================
diff -u -r4f32d5b19cafbdb87f4f9a1b227f0d63c31431c9 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java	(.../AuthoringDTO.java)	(revision 4f32d5b19cafbdb87f4f9a1b227f0d63c31431c9)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/AuthoringDTO.java	(.../AuthoringDTO.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -21,7 +21,7 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 
 package org.lamsfoundation.lams.tool.sbmt.dto;
 
@@ -37,6 +37,7 @@
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.sbmt.InstructionFiles;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
+
 /**
  * 
  * @author Steve.Ni
@@ -45,176 +46,223 @@
 public class AuthoringDTO implements Serializable {
 
 	private static final long serialVersionUID = 3555065437595921234L;
+
 	private Long contentID;
+
 	//basic tab
 	private String title;
+
 	private String instruction;
+
 	//instructions
 	private String onlineInstruction;
+
 	private String offlineInstruction;
+
 	private List onlineFiles;
+
 	private List offlineFiles;
+
 	//advance
 	private boolean lockOnFinished;
+
 	private boolean limitUpload;
+
 	private int limitUploadNumber;
+
 	private boolean reflectOnActivity;
+
 	private String reflectInstructions;
-	
-	public AuthoringDTO(){
+
+	private boolean notifyLearnersOnMarkRelease;
+
+	public AuthoringDTO() {
 	}
-	public AuthoringDTO(SubmitFilesContent content){
-		if(content == null)
+
+	public AuthoringDTO(SubmitFilesContent content) {
+		if (content == null) {
 			return;
+		}
 		try {
-			PropertyUtils.copyProperties(this,content);
-		} catch (IllegalAccessException e) {
+			PropertyUtils.copyProperties(this, content);
+		}
+		catch (IllegalAccessException e) {
 			throw new DTOException(e);
-		} catch (InvocationTargetException e) {
+		}
+		catch (InvocationTargetException e) {
 			throw new DTOException(e);
-		} catch (NoSuchMethodException e) {
+		}
+		catch (NoSuchMethodException e) {
 			throw new DTOException(e);
 		}
-		
+
 		onlineFiles = new ArrayList();
 		offlineFiles = new ArrayList();
 		Set fileSet = content.getInstructionFiles();
-		if(fileSet != null){
+		if (fileSet != null) {
 			Iterator iter = fileSet.iterator();
-			while(iter.hasNext()){
+			while (iter.hasNext()) {
 				InstructionFiles file = (InstructionFiles) iter.next();
-				if(StringUtils.equalsIgnoreCase(file.getType(),IToolContentHandler.TYPE_OFFLINE))
+				if (StringUtils.equalsIgnoreCase(file.getType(), IToolContentHandler.TYPE_OFFLINE)) {
 					offlineFiles.add(file);
-				else
+				}
+				else {
 					onlineFiles.add(file);
+				}
 			}
 		}
-		
+
 	}
+
 	/**
 	 * @return Returns the contentID.
 	 */
 	public Long getContentID() {
 		return contentID;
 	}
+
 	/**
 	 * @param contentID The contentID to set.
 	 */
 	public void setContentID(Long contentID) {
 		this.contentID = contentID;
 	}
+
 	/**
 	 * @return Returns the instruction.
 	 */
 	public String getInstruction() {
 		return instruction;
 	}
+
 	/**
 	 * @param instruction The instruction to set.
 	 */
 	public void setInstruction(String instruction) {
 		this.instruction = instruction;
 	}
+
 	/**
 	 * @return Returns the lockOnFinished.
 	 */
 	public boolean isLockOnFinished() {
 		return lockOnFinished;
 	}
+
 	/**
 	 * @param lockOnFinished The lockOnFinished to set.
 	 */
 	public void setLockOnFinished(boolean lockOnFinished) {
 		this.lockOnFinished = lockOnFinished;
 	}
+
 	/**
 	 * @return Returns the offlineFiles.
 	 */
 	public List getOfflineFiles() {
 		return offlineFiles;
 	}
+
 	/**
 	 * @param offlineFiles The offlineFiles to set.
 	 */
 	public void setOfflineFiles(List offlineFiles) {
 		this.offlineFiles = offlineFiles;
 	}
+
 	/**
 	 * @return Returns the offlineInstruction.
 	 */
 	public String getOfflineInstruction() {
 		return offlineInstruction;
 	}
+
 	/**
 	 * @param offlineInstruction The offlineInstruction to set.
 	 */
 	public void setOfflineInstruction(String offlineInstruction) {
 		this.offlineInstruction = offlineInstruction;
 	}
+
 	/**
 	 * @return Returns the onlineFiles.
 	 */
 	public List getOnlineFiles() {
 		return onlineFiles;
 	}
+
 	/**
 	 * @param onlineFiles The onlineFiles to set.
 	 */
 	public void setOnlineFiles(List onlineFiles) {
 		this.onlineFiles = onlineFiles;
 	}
+
 	/**
 	 * @return Returns the onlineInstruction.
 	 */
 	public String getOnlineInstruction() {
 		return onlineInstruction;
 	}
+
 	/**
 	 * @param onlineInstruction The onlineInstruction to set.
 	 */
 	public void setOnlineInstruction(String onlineInstruction) {
 		this.onlineInstruction = onlineInstruction;
 	}
+
 	/**
 	 * @return Returns the title.
 	 */
 	public String getTitle() {
 		return title;
 	}
+
 	/**
 	 * @param title The title to set.
 	 */
 	public void setTitle(String title) {
 		this.title = title;
 	}
+
 	public boolean isLimitUpload() {
 		return limitUpload;
 	}
+
 	public void setLimitUpload(boolean limitUpload) {
 		this.limitUpload = limitUpload;
 	}
-	
+
 	public int getLimitUploadNumber() {
 		return limitUploadNumber;
 	}
-	
+
 	public void setLimitUploadNumber(int limitUploadNumber) {
 		this.limitUploadNumber = limitUploadNumber;
 	}
-	
+
 	public boolean isReflectOnActivity() {
 		return reflectOnActivity;
 	}
-	
+
 	public void setReflectOnActivity(boolean reflectOnActivity) {
 		this.reflectOnActivity = reflectOnActivity;
 	}
-	
+
 	public String getReflectInstructions() {
 		return reflectInstructions;
 	}
-	
+
 	public void setReflectInstructions(String reflectInstructions) {
 		this.reflectInstructions = reflectInstructions;
 	}
+
+	public boolean isNotifyLearnersOnMarkRelease() {
+		return notifyLearnersOnMarkRelease;
+	}
+
+	public void setNotifyLearnersOnMarkRelease(boolean notifyLearnersOnMarkRelease) {
+		this.notifyLearnersOnMarkRelease = notifyLearnersOnMarkRelease;
+	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/AuthoringForm.java
===================================================================
diff -u -re7f9f5772bf6f3cf2786a65e78d7de441d348c37 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/AuthoringForm.java	(.../AuthoringForm.java)	(revision e7f9f5772bf6f3cf2786a65e78d7de441d348c37)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/AuthoringForm.java	(.../AuthoringForm.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -23,74 +23,93 @@
 public class AuthoringForm extends ValidatorForm {
 
 	private Long toolContentID;
-	
+
 	private String contentFolderID;
-	
+
 	//control fields
 	private String sessionMapID;
+
 	private String currentTab;
-	
+
 	//basic input fields
-    private String title;
-    private String instructions;
-    private String offlineInstruction; 
-    private String onlineInstruction;
-    private boolean lockOnFinished;
-	
-    //file and display fields
-    private FormFile offlineFile;
-    private FormFile onlineFile;
-    private List onlineFileList;
-    private List offlineFileList;
-    
-    private boolean limitUpload;
-    private int limitUploadNumber;
-    
-    private boolean reflectOnActivity;
-    private String reflectInstructions;
+	private String title;
 
-    public void reset(ActionMapping mapping, HttpServletRequest request){
-    	lockOnFinished = false;
-    	limitUpload= false;
-    	reflectOnActivity = false;
-    	
-    }
-	public void initContentValue(SubmitFilesContent content){
-		if(content == null)
+	private String instructions;
+
+	private String offlineInstruction;
+
+	private String onlineInstruction;
+
+	private boolean lockOnFinished;
+
+	//file and display fields
+	private FormFile offlineFile;
+
+	private FormFile onlineFile;
+
+	private List onlineFileList;
+
+	private List offlineFileList;
+
+	private boolean limitUpload;
+
+	private int limitUploadNumber;
+
+	private boolean reflectOnActivity;
+
+	private String reflectInstructions;
+
+	private boolean notifyLearnersOnMarkRelease;
+
+	@Override
+	public void reset(ActionMapping mapping, HttpServletRequest request) {
+		lockOnFinished = false;
+		limitUpload = false;
+		reflectOnActivity = false;
+
+	}
+
+	public void initContentValue(SubmitFilesContent content) {
+		if (content == null) {
 			return;
-		
+		}
+
 		//copy attribute
-		this.toolContentID= content.getContentID();
-		this.title = content.getTitle();
-		this.instructions = content.getInstruction();
-		this.offlineInstruction = content.getOfflineInstruction();
-		this.onlineInstruction = content.getOnlineInstruction();
-		this.lockOnFinished = content.isLockOnFinished();
-		
-		this.limitUpload = content.isLimitUpload();
-		this.limitUploadNumber = content.getLimitUploadNumber();
-		
-		this.reflectOnActivity = content.isReflectOnActivity();
-		this.reflectInstructions = content.getReflectInstructions();
-		
+		toolContentID = content.getContentID();
+		title = content.getTitle();
+		instructions = content.getInstruction();
+		offlineInstruction = content.getOfflineInstruction();
+		onlineInstruction = content.getOnlineInstruction();
+		lockOnFinished = content.isLockOnFinished();
+
+		limitUpload = content.isLimitUpload();
+		limitUploadNumber = content.getLimitUploadNumber();
+
+		reflectOnActivity = content.isReflectOnActivity();
+		reflectInstructions = content.getReflectInstructions();
+
 		onlineFileList = new ArrayList();
 		offlineFileList = new ArrayList();
 		Set fileSet = content.getInstructionFiles();
-		if(fileSet != null){
+		if (fileSet != null) {
 			Iterator iter = fileSet.iterator();
-			while(iter.hasNext()){
+			while (iter.hasNext()) {
 				InstructionFiles file = (InstructionFiles) iter.next();
-				if(StringUtils.equalsIgnoreCase(file.getType(),IToolContentHandler.TYPE_OFFLINE))
+				if (StringUtils.equalsIgnoreCase(file.getType(), IToolContentHandler.TYPE_OFFLINE)) {
 					offlineFileList.add(file);
-				else
+				}
+				else {
 					onlineFileList.add(file);
+				}
 			}
 		}
-		
+		setNotifyLearnersOnMarkRelease(content.isNotifyLearnersOnMarkRelease());
+
 	}
-    //**************************************************
-    // Get / Set method
-    //**************************************************
+
+	//**************************************************
+	// Get / Set method
+	//**************************************************
 	public String getCurrentTab() {
 		return currentTab;
 	}
@@ -186,34 +205,52 @@
 	public void setTitle(String title) {
 		this.title = title;
 	}
+
 	public String getReflectInstructions() {
 		return reflectInstructions;
 	}
+
 	public void setReflectInstructions(String reflectInstructions) {
 		this.reflectInstructions = reflectInstructions;
 	}
+
 	public boolean isReflectOnActivity() {
 		return reflectOnActivity;
 	}
+
 	public void setReflectOnActivity(boolean reflectOnActivity) {
 		this.reflectOnActivity = reflectOnActivity;
 	}
+
 	public String getContentFolderID() {
 		return contentFolderID;
 	}
+
 	public void setContentFolderID(String contentFolderID) {
 		this.contentFolderID = contentFolderID;
 	}
+
 	public boolean isLimitUpload() {
 		return limitUpload;
 	}
+
 	public void setLimitUpload(boolean limitUpload) {
 		this.limitUpload = limitUpload;
 	}
+
 	public int getLimitUploadNumber() {
 		return limitUploadNumber;
 	}
+
 	public void setLimitUploadNumber(int limitUploadNumber) {
 		this.limitUploadNumber = limitUploadNumber;
 	}
+
+	public boolean isNotifyLearnersOnMarkRelease() {
+		return notifyLearnersOnMarkRelease;
+	}
+
+	public void setNotifyLearnersOnMarkRelease(boolean notifyLearnersOnMarkRelease) {
+		this.notifyLearnersOnMarkRelease = notifyLearnersOnMarkRelease;
+	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
===================================================================
diff -u -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	(.../ISubmitFilesService.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -21,23 +21,23 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 
 package org.lamsfoundation.lams.tool.sbmt.service;
 
 import java.util.List;
 import java.util.Locale;
-import java.util.Set;
 import java.util.SortedMap;
 
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.contentrepository.IVersionedNode;
+import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.sbmt.InstructionFiles;
-import org.lamsfoundation.lams.tool.sbmt.SubmitUser;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
+import org.lamsfoundation.lams.tool.sbmt.SubmitUser;
 import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
 import org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -87,8 +87,9 @@
 	 * 
 	 * @throws SubmitFilesException
 	 */
-	public void uploadFileToSession(Long sessionID, FormFile uploadFile,
-			   String fileDescription, Integer userID) throws SubmitFilesException;
+	public void uploadFileToSession(Long sessionID, FormFile uploadFile, String fileDescription, Integer userID)
+			throws SubmitFilesException;
+
 	/**
 	 * Upload file to repository and persist relative attributes into database.
 	 *   
@@ -99,6 +100,7 @@
 	 * @throws SubmitFilesException
 	 */
 	public InstructionFiles uploadFileToContent(Long contentID, FormFile uploadFile, String fileType) throws SubmitFilesException;
+
 	/**
 	 * This method returns a list of files that were uploaded by the
 	 * given <code>User<code> for given <code>contentID</code>.
@@ -112,6 +114,7 @@
 	 * @return List The list of required objects.
 	 */
 	public List getFilesUploadedByUser(Integer userID, Long sessionID, Locale currentLocale);
+
 	/**
 	 * This method returns a SortedMap of all files that were submitted users within a
 	 * given <code>sessionID</code>.
@@ -122,14 +125,16 @@
 	public SortedMap getFilesUploadedBySession(Long sessionID, Locale currentLocale);
 
 	public void updateMarks(Long reportID, Float marks, String comments);
-	
+
 	public FileDetailsDTO getFileDetails(Long detailID, Locale currentLocale);
+
 	/**
 	 * Get SubmitFilesSession instance according to the given session id.
 	 * @param sessionID
 	 * @return
 	 */
 	public SubmitFilesSession getSessionById(Long sessionID);
+
 	public IVersionedNode downloadFile(Long uuid, Long versionID);
 
 	/**
@@ -140,44 +145,46 @@
 	public boolean releaseMarksForSession(Long sessionID);
 
 	public void deleteFromRepository(Long uuid, Long versionID);
+
 	/**
 	 * When learner finish submission, it invokes this function and will remark the <code>finished</code> field.
 	 * 
 	 * @param sessionID
 	 * @param userID
 	 */
 	public void finishSubmission(Long sessionID, Integer userID);
-    /**
-     * Create the default content for the given contentID. These default data will copy from default record in 
-     * Tool Content database table.
-     * 
-     * @return
-     * 		The SubmitFilesContent with default content and given contentID
-     */
+
+	/**
+	 * Create the default content for the given contentID. These default data will copy from default record in 
+	 * Tool Content database table.
+	 * 
+	 * @return
+	 * 		The SubmitFilesContent with default content and given contentID
+	 */
 	public SubmitFilesContent createDefaultContent(Long contentID);
-	
-	
-    /**
-     * This method retrieves the default content id.
-     * @param toolSignature The tool signature which is defined in lams_tool table.
-     * @return the default content id
-     */
-    public Long getToolDefaultContentIdBySignature(String toolSignature);
-    
-    /**
-     * This method retrieves a list of SubmitFileSession from the contentID.
-     * @param contentID
-     * @return a list of SubmitFileSession
-     */
-    //public List getSubmitFilesSessionsByContentID(Long contentID);
-    public List getSubmitFilesSessionByContentID(Long contentID);
-    /**
-     * Save or update tool content into database.
-     * @param persistContent
-     * 			The <code>SubmitFilesContent</code> to be updated
-     */
+
+	/**
+	 * This method retrieves the default content id.
+	 * @param toolSignature The tool signature which is defined in lams_tool table.
+	 * @return the default content id
+	 */
+	public Long getToolDefaultContentIdBySignature(String toolSignature);
+
+	/**
+	 * This method retrieves a list of SubmitFileSession from the contentID.
+	 * @param contentID
+	 * @return a list of SubmitFileSession
+	 */
+	//public List getSubmitFilesSessionsByContentID(Long contentID);
+	public List getSubmitFilesSessionByContentID(Long contentID);
+
+	/**
+	 * Save or update tool content into database.
+	 * @param persistContent
+	 * 			The <code>SubmitFilesContent</code> to be updated
+	 */
 	public void saveOrUpdateContent(SubmitFilesContent persistContent);
-	
+
 	/**
 	 * Create refection entry into notebook tool.
 	 * @param sessionId
@@ -186,7 +193,9 @@
 	 * @param userId
 	 * @param entryText
 	 */
-	public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, String entryText);
+	public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId,
+			String entryText);
+
 	/**
 	 * Get reflection entry from notebook tool.
 	 * @param sessionId
@@ -196,23 +205,24 @@
 	 * @return
 	 */
 	public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID);
-	
+
 	/**
 	 * @param notebookEntry
 	 */
 	public void updateEntry(NotebookEntry notebookEntry);
-	
+
 	/**
 	 * Delete instruction file by UID
 	 * @param uid
 	 */
 	public void deleteInstructionFile(Long uid);
-	
+
 	public List<SubmitFilesSession> getSessionsByContentID(Long toolContentID);
+
 	//*************************************************************
 	// get SubmitUser methods
 	//*************************************************************
-	
+
 	/**
 	 * Get learner by given <code>toolSessionID</code> and <code>userID</code>.
 	 *  
@@ -221,32 +231,39 @@
 	 * @return
 	 */
 	public SubmitUser getSessionUser(Long sessionID, Integer userID);
+
 	public SubmitUser getContentUser(Long contentId, Integer userID);
-	
+
 	/**
 	 * Create new user
 	 * @param userDto
 	 * @param sessionID
 	 * @return
 	 */
 	public SubmitUser createSessionUser(UserDTO userDto, Long sessionID);
+
 	public SubmitUser createContentUser(UserDTO user, Long contentId);
 
-
 	/**
 	 * Get information of all users who have submitted file.
 	 * @return The user information list
 	 */
 	public List<SubmitUser> getUsersBySession(Long sessionID);
-	
+
 	/**
 	 * get user by UID
 	 * @param uid
 	 * @return
 	 */
 	public SubmitUser getUserByUid(Long uid);
 
+	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);
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -rdf7afd48fb5e2e8610f6010b24f813c36c4b7d67 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision df7afd48fb5e2e8610f6010b24f813c36c4b7d67)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -21,7 +21,7 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 
 package org.lamsfoundation.lams.tool.sbmt.service;
 
@@ -35,6 +35,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.SortedSet;
@@ -59,6 +60,7 @@
 import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
 import org.lamsfoundation.lams.contentrepository.service.RepositoryProxy;
 import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
+import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
@@ -96,148 +98,166 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.usermanagement.util.LastNameAlphabeticComparator;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.springframework.dao.DataAccessException;
 
 /**
  * @author Manpreet Minhas
  */
-public class SubmitFilesService implements ToolContentManager,
-		ToolSessionManager, ISubmitFilesService, ToolContentImport102Manager {
+public class SubmitFilesService implements ToolContentManager, ToolSessionManager, ISubmitFilesService,
+		ToolContentImport102Manager {
 
 	private static Logger log = Logger.getLogger(SubmitFilesService.class);
-	
+
 	private ISubmitFilesContentDAO submitFilesContentDAO;
+
 	private ISubmitFilesReportDAO submitFilesReportDAO;
+
 	private ISubmitFilesSessionDAO submitFilesSessionDAO;
+
 	private ISubmissionDetailsDAO submissionDetailsDAO;
+
 	private ISubmitUserDAO submitUserDAO;
+
 	private IAttachmentDAO attachmentDAO;
-	
+
 	private IToolContentHandler sbmtToolContentHandler;
+
 	private ILamsToolService toolService;
+
 	private ILearnerService learnerService;
+
 	private IRepositoryService repositoryService;
+
 	private IExportToolContentService exportContentService;
+
 	private ICoreNotebookService coreNotebookService;
+
 	private IUserManagementService userManagementService;
-	
-	private class FileDtoComparator implements Comparator<FileDetailsDTO>{
 
+	private IEventNotificationService eventNotificationService;
+
+	private MessageService messageService;
+
+	private class FileDtoComparator implements Comparator<FileDetailsDTO> {
+
 		public int compare(FileDetailsDTO o1, FileDetailsDTO o2) {
-			if(o1 != null && o2 != null && o1.getDateOfSubmission() !=null && o2.getDateOfSubmission() != null){
+			if (o1 != null && o2 != null && o1.getDateOfSubmission() != null && o2.getDateOfSubmission() != null) {
 				//don't use Date.comparaTo() directly, because the date could be Timestamp or Date (depeneds the object is persist or not)
-				return (o1.getDateOfSubmission().getTime() - o2.getDateOfSubmission().getTime()) > 0 ?1:-1;
-			}else if(o1 != null)
+				return o1.getDateOfSubmission().getTime() - o2.getDateOfSubmission().getTime() > 0 ? 1 : -1;
+			}
+			else if (o1 != null) {
 				return 1;
-			else
+			}
+			else {
 				return -1;
+			}
 		}
-		
+
 	}
-	public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, String 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){
+
+	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 {
+		}
+		else {
 			return list.get(0);
 		}
-	}	
-	
+	}
+
 	public void updateEntry(NotebookEntry notebookEntry) {
 		coreNotebookService.updateEntry(notebookEntry);
 	}
-	
+
 	/**
 	 * (non-Javadoc)
 	 * 
 	 * @see org.lamsfoundation.lams.tool.ToolContentManager#copyToolContent(java.lang.Long,
 	 *      java.lang.Long)
 	 */
 	public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException {
-		if (toContentId == null)
-			throw new ToolException(
-					"Failed to create the SubmitFiles tool seession");
+		if (toContentId == null) {
+			throw new ToolException("Failed to create the SubmitFiles tool seession");
+		}
 
 		SubmitFilesContent fromContent = null;
-		if ( fromContentId != null ) {
+		if (fromContentId != null) {
 			fromContent = submitFilesContentDAO.getContentByID(fromContentId);
 		}
-		if ( fromContent == null ) {
+		if (fromContent == null) {
 			fromContent = getDefaultSubmit();
 		}
-		SubmitFilesContent toContent = SubmitFilesContent.newInstance(fromContent,toContentId,sbmtToolContentHandler);
+		SubmitFilesContent toContent = SubmitFilesContent.newInstance(fromContent, toContentId, sbmtToolContentHandler);
 
 		submitFilesContentDAO.saveOrUpdate(toContent);
 	}
-    /**
-     * @see org.lamsfoundation.lams.tool.ToolContentManager#setAsRunOffline(java.lang.Long)
-     */
-    public void setAsRunOffline(Long toolContentId, boolean value)
-    {
-        //pre-condition validation
-        if (toolContentId == null)
-            throw new SubmitFilesException("Fail to set tool content to run offline - "
-                    + " based on null toolContentId");
-        try
-        {
-            SubmitFilesContent content = getSubmitFilesContent(toolContentId);
-            if ( content == null || !toolContentId.equals(content.getContentID())) {
-                content = duplicateDefaultToolContent(toolContentId);
-            }
-            content.setRunOffline(value);
-            submitFilesContentDAO.saveOrUpdate(content);
-        }
-        catch (DataAccessException e)
-        {
-            throw new SubmitFilesException("Exception occured when LAMS is setting content to run offline"
-                                                  + e.getMessage(),e);
-        }
-    }
-    
+
 	/**
+	 * @see org.lamsfoundation.lams.tool.ToolContentManager#setAsRunOffline(java.lang.Long)
+	 */
+	public void setAsRunOffline(Long toolContentId, boolean value) {
+		//pre-condition validation
+		if (toolContentId == null) {
+			throw new SubmitFilesException("Fail to set tool content to run offline - " + " based on null toolContentId");
+		}
+		try {
+			SubmitFilesContent content = getSubmitFilesContent(toolContentId);
+			if (content == null || !toolContentId.equals(content.getContentID())) {
+				content = duplicateDefaultToolContent(toolContentId);
+			}
+			content.setRunOffline(value);
+			submitFilesContentDAO.saveOrUpdate(content);
+		}
+		catch (DataAccessException e) {
+			throw new SubmitFilesException("Exception occured when LAMS is setting content to run offline" + e.getMessage(), e);
+		}
+	}
+
+	/**
 	 * If the toolContentID does not exist, then get default tool content id from tool core and 
 	 * initialize a emtpy <code>SubmitFilesContent</code> return.
 	 * 
 	 * @param toolContentId
 	 * @return
 	 */
 	private SubmitFilesContent duplicateDefaultToolContent(Long toolContentId) {
-		long contentId=0;
-		contentId =toolService.getToolDefaultContentIdBySignature(SbmtConstants.TOOL_SIGNATURE);
+		long contentId = 0;
+		contentId = toolService.getToolDefaultContentIdBySignature(SbmtConstants.TOOL_SIGNATURE);
 		SubmitFilesContent content = new SubmitFilesContent();
 		content.setContentID(new Long(contentId));
 		return content;
 	}
 
 	/**
-     * @see org.lamsfoundation.lams.tool.ToolContentManager#setAsDefineLater(java.lang.Long)
-     */
-    public void setAsDefineLater(Long toolContentId, boolean value) {
-        //pre-condition validation
-        if (toolContentId == null)
-            throw new SubmitFilesException("Fail to set tool content to define later - "
-                    + " based on null toolContentId");
-        try
-        {
-            SubmitFilesContent content = getSubmitFilesContent(toolContentId);
-            if ( content == null || !toolContentId.equals(content.getContentID())) {
-                content = duplicateDefaultToolContent(toolContentId);
-            }
-            content.setDefineLater(value);
-            submitFilesContentDAO.saveOrUpdate(content);
-        }
-        catch (DataAccessException e)
-        {
-            throw new SubmitFilesException("Exception occured when LAMS is setting content to run define later"
-                                                  + e.getMessage(),e);
-        }
-       
-    }
+	 * @see org.lamsfoundation.lams.tool.ToolContentManager#setAsDefineLater(java.lang.Long)
+	 */
+	public void setAsDefineLater(Long toolContentId, boolean value) {
+		//pre-condition validation
+		if (toolContentId == null) {
+			throw new SubmitFilesException("Fail to set tool content to define later - " + " based on null toolContentId");
+		}
+		try {
+			SubmitFilesContent content = getSubmitFilesContent(toolContentId);
+			if (content == null || !toolContentId.equals(content.getContentID())) {
+				content = duplicateDefaultToolContent(toolContentId);
+			}
+			content.setDefineLater(value);
+			submitFilesContentDAO.saveOrUpdate(content);
+		}
+		catch (DataAccessException e) {
+			throw new SubmitFilesException("Exception occured when LAMS is setting content to run define later" + e.getMessage(),
+					e);
+		}
 
+	}
+
 	/**
 	 * @throws SessionDataExistsException 
 	 * 
@@ -246,11 +266,12 @@
 	public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException {
 		SubmitFilesContent submitFilesContent = submitFilesContentDAO.getContentByID(toolContentId);
 		if (submitFilesContent != null) {
-		   //if session data exist and removeSessionData=false, throw an exception
+			//if session data exist and removeSessionData=false, throw an exception
 			List submissionData = submitFilesSessionDAO.getSubmitFilesSessionByContentID(toolContentId);
-			if ( !(submissionData==null || submissionData.isEmpty()) && ! removeSessionData) {
-		        throw new SessionDataExistsException("Delete failed: There is session data that belongs to this tool content id");
-			} else if ( submissionData != null ){
+			if (!(submissionData == null || submissionData.isEmpty()) && !removeSessionData) {
+				throw new SessionDataExistsException("Delete failed: There is session data that belongs to this tool content id");
+			}
+			else if (submissionData != null) {
 				Iterator iter = submissionData.iterator();
 				while (iter.hasNext()) {
 					SubmitFilesSession element = (SubmitFilesSession) iter.next();
@@ -261,64 +282,72 @@
 		}
 	}
 
-	public List<SubmitFilesSession> getSessionsByContentID(Long toolContentID){
+	public List<SubmitFilesSession> getSessionsByContentID(Long toolContentID) {
 		return submitFilesSessionDAO.getSubmitFilesSessionByContentID(toolContentID);
 	}
+
 	/**
-     * Export the XML fragment for the tool's content, along with any files needed
-     * for the content.
+	 * Export the XML fragment for the tool's content, along with any files needed
+	 * for the content.
 	 * @throws ExportToolContentException 
-     */
- 	public void exportToolContent(Long toolContentId , String toPath) throws ToolException, DataMissingException{
- 		exportContentService.registerFileClassForExport(InstructionFiles.class.getName(),"uuID","versionID");
- 		SubmitFilesContent toolContentObj = submitFilesContentDAO.getContentByID(toolContentId);
- 		if(toolContentObj == null) {
- 			toolContentObj = getDefaultSubmit();
- 		}
- 	 	if(toolContentObj == null)
- 			throw new DataMissingException("Unable to find default content for the submit files tool");
- 		
- 		//set toolContentHandler as null to avoid duplicate file node in repository.
- 		toolContentObj = SubmitFilesContent.newInstance(toolContentObj,toolContentId,null);
- 		toolContentObj.setToolContentHandler(null);
+	 */
+	public void exportToolContent(Long toolContentId, String toPath) throws ToolException, DataMissingException {
+		exportContentService.registerFileClassForExport(InstructionFiles.class.getName(), "uuID", "versionID");
+		SubmitFilesContent toolContentObj = submitFilesContentDAO.getContentByID(toolContentId);
+		if (toolContentObj == null) {
+			toolContentObj = getDefaultSubmit();
+		}
+		if (toolContentObj == null) {
+			throw new DataMissingException("Unable to find default content for the submit files tool");
+		}
+
+		//set toolContentHandler as null to avoid duplicate file node in repository.
+		toolContentObj = SubmitFilesContent.newInstance(toolContentObj, toolContentId, null);
+		toolContentObj.setToolContentHandler(null);
 		try {
-			exportContentService.exportToolContent( toolContentId, toolContentObj,sbmtToolContentHandler, toPath);
-		} catch (ExportToolContentException e) {
+			exportContentService.exportToolContent(toolContentId, toolContentObj, sbmtToolContentHandler, toPath);
+		}
+		catch (ExportToolContentException e) {
 			throw new ToolException(e);
 		}
 	}
- 	
- 	public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath,String fromVersion,String toVersion) throws ToolException {
- 		
+
+	public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion,
+			String toVersion) throws ToolException {
+
 		try {
-			exportContentService.registerFileClassForImport(InstructionFiles.class.getName(),"uuID","versionID","name","type",null,null);
-			
-			Object toolPOJO =  exportContentService.importToolContent(toolContentPath,sbmtToolContentHandler,fromVersion,toVersion);
-			if(!(toolPOJO instanceof SubmitFilesContent))
+			exportContentService.registerFileClassForImport(InstructionFiles.class.getName(), "uuID", "versionID", "name",
+					"type", null, null);
+
+			Object toolPOJO = exportContentService.importToolContent(toolContentPath, sbmtToolContentHandler, fromVersion,
+					toVersion);
+			if (!(toolPOJO instanceof SubmitFilesContent)) {
 				throw new ImportToolContentException("Import Submit tool content failed. Deserialized object is " + toolPOJO);
+			}
 			SubmitFilesContent toolContentObj = (SubmitFilesContent) toolPOJO;
-			
+
 			//reset it to new toolContentId
 			toolContentObj.setContentID(toolContentId);
-			
-			SubmitUser user = submitUserDAO.getContentUser(toolContentId,newUserUid);
-			if(user == null){
+
+			SubmitUser user = submitUserDAO.getContentUser(toolContentId, newUserUid);
+			if (user == null) {
 				user = new SubmitUser();
-				UserDTO sysUser = ((User)userManagementService.findById(User.class,newUserUid)).getUserDTO();
+				UserDTO sysUser = ((User) userManagementService.findById(User.class, newUserUid)).getUserDTO();
 				user.setFirstName(sysUser.getFirstName());
 				user.setLastName(sysUser.getLastName());
 				user.setLogin(sysUser.getLogin());
 				user.setUserID(newUserUid);
 				user.setContentID(toolContentId);
 				submitUserDAO.saveOrUpdateUser(user);
 			}
-			
+
 			toolContentObj.setCreatedBy(user);
 			toolContentObj.setCreated(new Date());
 			toolContentObj.setUpdated(new Date());
-			
+
 			submitFilesContentDAO.saveOrUpdate(toolContentObj);
-		} catch (ImportToolContentException e) {
+		}
+		catch (ImportToolContentException e) {
 			throw new ToolException(e);
 		}
 	}
@@ -351,12 +380,14 @@
 		SubmitFilesContent content = null;
 		try {
 			content = submitFilesContentDAO.getContentByID(contentID);
-		} catch (Exception e) {
-			log.error("Could not find the content by given ID:"+contentID+". Excpetion is " + e);
 		}
-		if ( content == null )
-			log.error("Could not find the content by given ID:"+contentID);
-		
+		catch (Exception e) {
+			SubmitFilesService.log.error("Could not find the content by given ID:" + contentID + ". Excpetion is " + e);
+		}
+		if (content == null) {
+			SubmitFilesService.log.error("Could not find the content by given ID:" + contentID);
+		}
+
 		return content;
 	}
 
@@ -367,7 +398,7 @@
 	 */
 	public SubmitFilesReport getSubmitFilesReport(Long reportID) {
 		return submitFilesReportDAO.getReportByID(reportID);
-	}	
+	}
 
 	/**
 	 * This method verifies the credentials of the SubmitFiles Tool and gives it
@@ -382,20 +413,19 @@
 	 */
 	private ITicket getRepositoryLoginTicket() throws SubmitFilesException {
 		repositoryService = RepositoryProxy.getRepositoryService();
-		ICredentials credentials = new SimpleCredentials(
-				SbmtToolContentHandler.repositoryUser,
+		ICredentials credentials = new SimpleCredentials(SbmtToolContentHandler.repositoryUser,
 				SbmtToolContentHandler.repositoryId);
 		try {
-			ITicket ticket = repositoryService.login(credentials,
-					SbmtToolContentHandler.repositoryWorkspaceName);
+			ITicket ticket = repositoryService.login(credentials, SbmtToolContentHandler.repositoryWorkspaceName);
 			return ticket;
-		} catch (AccessDeniedException ae) {
-			throw new SubmitFilesException("Access Denied to repository."
-					+ ae.getMessage());
-		} catch (WorkspaceNotFoundException we) {
-			throw new SubmitFilesException("Workspace not found."
-					+ we.getMessage());
-		} catch (LoginException e) {
+		}
+		catch (AccessDeniedException ae) {
+			throw new SubmitFilesException("Access Denied to repository." + ae.getMessage());
+		}
+		catch (WorkspaceNotFoundException we) {
+			throw new SubmitFilesException("Workspace not found." + we.getMessage());
+		}
+		catch (LoginException e) {
 			throw new SubmitFilesException("Login failed." + e.getMessage());
 		}
 	}
@@ -410,18 +440,17 @@
 	 *            The <code>version_id</code> of the node to be deleted.
 	 * @throws SubmitFilesException
 	 */
-	public void deleteFromRepository(Long uuid, Long versionID)
-			throws SubmitFilesException {
+	public void deleteFromRepository(Long uuid, Long versionID) throws SubmitFilesException {
 		ITicket ticket = getRepositoryLoginTicket();
 		try {
-			repositoryService.deleteVersion(ticket, uuid,versionID);
-		} catch (Exception e) {
-			throw new SubmitFilesException(
-					"Exception occured while deleting files from"
-							+ " the repository " + e.getMessage());
+			repositoryService.deleteVersion(ticket, uuid, versionID);
 		}
+		catch (Exception e) {
+			throw new SubmitFilesException("Exception occured while deleting files from" + " the repository " + e.getMessage());
+		}
 	}
-	public void deleteInstructionFile(Long uid){
+
+	public void deleteInstructionFile(Long uid) {
 		attachmentDAO.deleteById(InstructionFiles.class, uid);
 	}
 
@@ -432,36 +461,33 @@
 	 *      java.lang.Long)
 	 */
 	public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) {
-        //pre-condition validation
-        if (toolSessionId == null || toolContentId == null)
-            throw new SubmitFilesException("Fail to create a submission session"
-                    + " based on null toolSessionId or toolContentId");
+		//pre-condition validation
+		if (toolSessionId == null || toolContentId == null) {
+			throw new SubmitFilesException("Fail to create a submission session"
+					+ " based on null toolSessionId or toolContentId");
+		}
 
-        log.debug("Start to create submission session based on toolSessionId["
-                + toolSessionId.longValue() + "] and toolContentId["
-                + toolContentId.longValue() + "]");
-        try
-        {
-            SubmitFilesContent submitContent = getSubmitFilesContent(toolContentId);
-            if ( submitContent == null || !toolContentId.equals(submitContent.getContentID())) {
-            	submitContent = new SubmitFilesContent();
-            	submitContent.setContentID(toolContentId);
-            }
-            SubmitFilesSession submitSession = new SubmitFilesSession ();
+		SubmitFilesService.log.debug("Start to create submission session based on toolSessionId[" + toolSessionId.longValue()
+				+ "] and toolContentId[" + toolContentId.longValue() + "]");
+		try {
+			SubmitFilesContent submitContent = getSubmitFilesContent(toolContentId);
+			if (submitContent == null || !toolContentId.equals(submitContent.getContentID())) {
+				submitContent = new SubmitFilesContent();
+				submitContent.setContentID(toolContentId);
+			}
+			SubmitFilesSession submitSession = new SubmitFilesSession();
 
-            submitSession.setSessionID(toolSessionId);
-            submitSession.setSessionName(toolSessionName);
-            submitSession.setStatus(new Integer(SubmitFilesSession.INCOMPLETE));
-            submitSession.setContent(submitContent);
-            submitFilesSessionDAO.createSession(submitSession);
-            log.debug("Submit File session created");
-        }
-        catch (DataAccessException e)
-        {
-            throw new SubmitFilesException("Exception occured when lams is creating"
-                                                         + " a submission Session: "
-                                                         + e.getMessage(),e);
-        }
+			submitSession.setSessionID(toolSessionId);
+			submitSession.setSessionName(toolSessionName);
+			submitSession.setStatus(new Integer(SubmitFilesSession.INCOMPLETE));
+			submitSession.setContent(submitContent);
+			submitFilesSessionDAO.createSession(submitSession);
+			SubmitFilesService.log.debug("Submit File session created");
+		}
+		catch (DataAccessException e) {
+			throw new SubmitFilesException(
+					"Exception occured when lams is creating" + " a submission Session: " + e.getMessage(), e);
+		}
 
 	}
 
@@ -471,28 +497,28 @@
 	 * @see org.lamsfoundation.lams.tool.ToolSessionManager#leaveToolSession(java.lang.Long,
 	 *      org.lamsfoundation.lams.usermanagement.User)
 	 */
-	public String leaveToolSession(Long toolSessionId, Long learnerId)
-		   throws DataMissingException, ToolException{
-			if(toolSessionId == null){
-				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){
-				log.error("Fail to leave tool Session based on null learner.");
-				throw new ToolException("Fail to remove tool Session based on null learner.");
-			}
-			
-			SubmitFilesSession session = submitFilesSessionDAO.getSessionByID(toolSessionId);
-			if(session != null){
-				session.setStatus(new Integer(SubmitFilesSession.COMPLETED));
-				submitFilesSessionDAO.update(session);
-			}else{
-				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) {
+			SubmitFilesService.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) {
+			SubmitFilesService.log.error("Fail to leave tool Session based on null learner.");
+			throw new ToolException("Fail to remove tool Session based on null learner.");
+		}
+
+		SubmitFilesSession session = submitFilesSessionDAO.getSessionByID(toolSessionId);
+		if (session != null) {
+			session.setStatus(new Integer(SubmitFilesSession.COMPLETED));
+			submitFilesSessionDAO.update(session);
+		}
+		else {
+			SubmitFilesService.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);
 	}
 
 	/**
@@ -520,51 +546,49 @@
 	 * 
 	 * @see org.lamsfoundation.lams.tool.ToolSessionManager#removeToolSession(java.lang.Long)
 	 */
-	public void removeToolSession(Long toolSessionId)
-	   throws DataMissingException, ToolException{
-		if(toolSessionId == null){
-			log.error("Fail to remove tool Session based on null tool session id.");
+	public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException {
+		if (toolSessionId == null) {
+			SubmitFilesService.log.error("Fail to remove tool Session based on null tool session id.");
 			throw new ToolException("Fail to remove tool Session based on null tool session id.");
 		}
-			
+
 		SubmitFilesSession session = submitFilesSessionDAO.getSessionByID(toolSessionId);
-		if ( session != null ) {
+		if (session != null) {
 			removeToolSession(session);
-		} else {
-			log.error("Could not find submit file session by given session id: "+toolSessionId);
-			throw new DataMissingException("Could not find submit file session by given session id: "+toolSessionId);
 		}
+		else {
+			SubmitFilesService.log.error("Could not find submit file session by given session id: " + toolSessionId);
+			throw new DataMissingException("Could not find submit file session by given session id: " + toolSessionId);
+		}
 	}
-	
+
 	/** Remove a tool session. The session parameter must not be null. */
 	private void removeToolSession(SubmitFilesSession session) {
 		Set filesUploaded = session.getSubmissionDetails();
-		if(filesUploaded!=null){
-			Iterator fileIterator = filesUploaded.iterator();				
-			while(fileIterator.hasNext()){
-				SubmissionDetails details = (SubmissionDetails)fileIterator.next();
-				deleteFromRepository(details.getUuid(),details.getVersionID());
+		if (filesUploaded != null) {
+			Iterator fileIterator = filesUploaded.iterator();
+			while (fileIterator.hasNext()) {
+				SubmissionDetails details = (SubmissionDetails) fileIterator.next();
+				deleteFromRepository(details.getUuid(), details.getVersionID());
 				submissionDetailsDAO.delete(details);
 			}
-		}			
+		}
 		submitFilesSessionDAO.delete(session);
 	}
-	
+
 	/** 
 	 * 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) {
-		return new TreeMap<String,ToolOutput>();
+	public SortedMap<String, ToolOutput> getToolOutput(List<String> names, Long toolSessionId, Long learnerId) {
+		return new TreeMap<String, ToolOutput>();
 	}
 
 	/** 
 	 * 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) {
+	public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 		return null;
 	}
 
@@ -573,341 +597,393 @@
 	 * 
 	 * @see org.lamsfoundation.lams.tool.ToolSessionManager# uploadFileToContent(Long,FormFile ) 
 	 */
-	public InstructionFiles uploadFileToContent(Long contentID, FormFile uploadFile,String fileType) throws SubmitFilesException{
-		if(uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName()))
+	public InstructionFiles uploadFileToContent(Long contentID, FormFile uploadFile, String fileType) throws SubmitFilesException {
+		if (uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName())) {
 			throw new SubmitFilesException("Could not find upload file: " + uploadFile);
-		
-		NodeKey nodeKey = processFile(uploadFile,fileType);
-		
+		}
+
+		NodeKey nodeKey = processFile(uploadFile, fileType);
+
 		InstructionFiles file = new InstructionFiles();
 		file.setType(fileType);
 		file.setUuID(nodeKey.getUuid());
 		file.setVersionID(nodeKey.getVersion());
 		file.setName(uploadFile.getFileName());
-		
+
 		return file;
 	}
+
 	/**
 	 * (non-Javadoc)
 	 * 
 	 * @see org.lamsfoundation.lams.tool.ToolSessionManager# uploadFileToSession(Long,FormFile,String,Long ) 
 	 */
-	public void uploadFileToSession(Long sessionID, FormFile uploadFile,
-						   String fileDescription, Integer userID) throws SubmitFilesException{
-			
-			if(uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName()))
-				throw new SubmitFilesException("Could not find upload file: " + uploadFile);
-			
-			SubmitFilesSession session = submitFilesSessionDAO.getSessionByID(sessionID);
-			if (session == null)
-				throw new SubmitFilesException(
-						"No such session with a sessionID of: " + sessionID
-								+ " found.");
-			
-			NodeKey nodeKey = processFile(uploadFile,IToolContentHandler.TYPE_ONLINE);
-			
-			SubmissionDetails details = new SubmissionDetails();
-			details.setFileDescription(fileDescription);
-			details.setFilePath(uploadFile.getFileName());
-			details.setDateOfSubmission(new Date());
-			
-			SubmitUser learner = submitUserDAO.getLearner(sessionID,userID);
-			details.setLearner(learner);
-			details.setUuid(nodeKey.getUuid());
-			details.setVersionID(nodeKey.getVersion());
-			SubmitFilesReport report = new SubmitFilesReport();
-			details.setReport(report);
-			details.setSubmitFileSession(session);
-			
-			//update session, then insert the detail too.
-			Set detailSet = session.getSubmissionDetails();
-			detailSet.add(details);
-			session.setSubmissionDetails(detailSet);
-			submissionDetailsDAO.saveOrUpdate(session);
+	public void uploadFileToSession(Long sessionID, FormFile uploadFile, String fileDescription, Integer userID)
+			throws SubmitFilesException {
 
+		if (uploadFile == null || StringUtils.isEmpty(uploadFile.getFileName())) {
+			throw new SubmitFilesException("Could not find upload file: " + uploadFile);
+		}
+
+		SubmitFilesSession session = submitFilesSessionDAO.getSessionByID(sessionID);
+		if (session == null) {
+			throw new SubmitFilesException("No such session with a sessionID of: " + sessionID + " found.");
+		}
+
+		NodeKey nodeKey = processFile(uploadFile, IToolContentHandler.TYPE_ONLINE);
+
+		SubmissionDetails details = new SubmissionDetails();
+		details.setFileDescription(fileDescription);
+		details.setFilePath(uploadFile.getFileName());
+		details.setDateOfSubmission(new Date());
+
+		SubmitUser learner = submitUserDAO.getLearner(sessionID, userID);
+		details.setLearner(learner);
+		details.setUuid(nodeKey.getUuid());
+		details.setVersionID(nodeKey.getVersion());
+		SubmitFilesReport report = new SubmitFilesReport();
+		details.setReport(report);
+		details.setSubmitFileSession(session);
+
+		//update session, then insert the detail too.
+		Set detailSet = session.getSubmissionDetails();
+		detailSet.add(details);
+		session.setSubmissionDetails(detailSet);
+		submissionDetailsDAO.saveOrUpdate(session);
+
 	}
-    /**
-     * 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 = getSbmtToolContentHandler().uploadFile(file.getInputStream(), fileName, 
-				        file.getContentType(), fileType);
-			} catch (InvalidParameterException e) {
+
+	/**
+	 * 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 = getSbmtToolContentHandler().uploadFile(file.getInputStream(), fileName, file.getContentType(), fileType);
+			}
+			catch (InvalidParameterException e) {
 				throw new SubmitFilesException("FileNotFoundException occured while trying to upload File" + e.getMessage());
-			} catch (FileNotFoundException e) {
+			}
+			catch (FileNotFoundException e) {
 				throw new SubmitFilesException("FileNotFoundException occured while trying to upload File" + e.getMessage());
-			} catch (RepositoryCheckedException e) {
+			}
+			catch (RepositoryCheckedException e) {
 				throw new SubmitFilesException("FileNotFoundException occured while trying to upload File" + e.getMessage());
-			} catch (IOException e) {
+			}
+			catch (IOException e) {
 				throw new SubmitFilesException("FileNotFoundException occured while trying to upload File" + e.getMessage());
 			}
-          }
-        return node;
-    }
+		}
+		return node;
+	}
+
 	/**
 	 * (non-Javadoc)
 	 * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#getFilesUploadedByUserForContent(java.lang.Long, java.lang.Long)
 	 */
-	public List getFilesUploadedByUser(Integer userID, Long sessionID, Locale currentLocale){
+	public List getFilesUploadedByUser(Integer userID, Long sessionID, Locale currentLocale) {
 		List<SubmissionDetails> list = submissionDetailsDAO.getBySessionAndLearner(sessionID, userID);
 		SortedSet details = new TreeSet(this.new FileDtoComparator());
-		if(list ==null)
+		if (list == null) {
 			return new ArrayList(details);
-		
+		}
+
 		NumberFormat numberFormat = currentLocale != null ? NumberFormat.getInstance(currentLocale) : null;
-		for(SubmissionDetails submissionDetails : list){
+		for (SubmissionDetails submissionDetails : list) {
 			FileDetailsDTO detailDto = new FileDetailsDTO(submissionDetails, numberFormat);
 			details.add(detailDto);
 		}
-		return  new ArrayList(details);
+		return new ArrayList(details);
 	}
+
 	/**
 	 * This method save SubmissionDetails list into a map container: key is user id,
 	 * value is a list container, which contains all <code>FileDetailsDTO</code> object belong to
 	 * this user.
 	 */
 	public SortedMap getFilesUploadedBySession(Long sessionID, Locale currentLocale) {
-		List list =  submissionDetailsDAO.getSubmissionDetailsBySession(sessionID);
-		if(list!=null){
+		List list = submissionDetailsDAO.getSubmissionDetailsBySession(sessionID);
+		if (list != null) {
 			SortedMap map = new TreeMap(new LastNameAlphabeticComparator());
 			Iterator iterator = list.iterator();
 			List userFileList;
 			NumberFormat numberFormat = currentLocale != null ? NumberFormat.getInstance(currentLocale) : null;
-			while(iterator.hasNext()){
-				SubmissionDetails submissionDetails = (SubmissionDetails)iterator.next();
+			while (iterator.hasNext()) {
+				SubmissionDetails submissionDetails = (SubmissionDetails) iterator.next();
 				SubmitUser learner = submissionDetails.getLearner();
-				if(learner == null){
-					log.error("Could not find learer for special submission item:" + submissionDetails);
+				if (learner == null) {
+					SubmitFilesService.log.error("Could not find learer for special submission item:" + submissionDetails);
 					return null;
 				}
 				SubmitUserDTO submitUserDTO = new SubmitUserDTO(learner);
-				
+
 				FileDetailsDTO detailDto = new FileDetailsDTO(submissionDetails, numberFormat);
 				userFileList = (List) map.get(submitUserDTO);
 				//if it is first time to this user, creating a new ArrayList for this user.
-				if(userFileList == null)
+				if (userFileList == null) {
 					userFileList = new ArrayList();
+				}
 				userFileList.add(detailDto);
 				map.put(submitUserDTO, userFileList);
 			}
 			return map;
 		}
-		else
+		else {
 			return null;
+		}
 	}
-	
-	public FileDetailsDTO getFileDetails(Long detailID, Locale currentLocale){
-			SubmissionDetails details = submissionDetailsDAO.getSubmissionDetailsByID(detailID);
-			return new FileDetailsDTO(details, currentLocale != null ? NumberFormat.getInstance(currentLocale) : null);			
+
+	public FileDetailsDTO getFileDetails(Long detailID, Locale currentLocale) {
+		SubmissionDetails details = submissionDetailsDAO.getSubmissionDetailsByID(detailID);
+		return new FileDetailsDTO(details, currentLocale != null ? NumberFormat.getInstance(currentLocale) : null);
 	}
+
 	/**
 	 * (non-Javadoc)
 	 * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#getUsersBySession(java.lang.Long)
 	 */
-	public List<SubmitUser> getUsersBySession(Long sessionID){
+	public List<SubmitUser> getUsersBySession(Long sessionID) {
 		return submitUserDAO.getUsersBySession(sessionID);
 	}
 
-	public void updateMarks(Long reportID, Float marks, String comments){
+	public void updateMarks(Long reportID, Float marks, String comments) {
 		SubmitFilesReport report = submitFilesReportDAO.getReportByID(reportID);
-		if(report!=null){
+		if (report != null) {
 			report.setComments(comments);
 			report.setMarks(marks);
 			submitFilesReportDAO.update(report);
 		}
 	}
-	public IVersionedNode downloadFile(Long uuid, Long versionID)throws SubmitFilesException{
-		ITicket ticket = getRepositoryLoginTicket();		
-		try{
-			IVersionedNode node = repositoryService.getFileItem(ticket,uuid,null);
+
+	public IVersionedNode downloadFile(Long uuid, Long versionID) throws SubmitFilesException {
+		ITicket ticket = getRepositoryLoginTicket();
+		try {
+			IVersionedNode node = repositoryService.getFileItem(ticket, uuid, null);
 			return node;
-		}catch(AccessDeniedException ae){
+		}
+		catch (AccessDeniedException ae) {
 			throw new SubmitFilesException("AccessDeniedException occured while trying to download file " + ae.getMessage());
-		}catch(FileException fe){
+		}
+		catch (FileException fe) {
 			throw new SubmitFilesException("FileException occured while trying to download file " + fe.getMessage());
-		}catch(ItemNotFoundException ie){
-			throw new SubmitFilesException("ItemNotFoundException occured while trying to download file " + ie.getMessage());			
 		}
+		catch (ItemNotFoundException ie) {
+			throw new SubmitFilesException("ItemNotFoundException occured while trying to download file " + ie.getMessage());
+		}
 	}
-	public SubmitFilesSession getSessionById(Long sessionID){
+
+	public SubmitFilesSession getSessionById(Long sessionID) {
 		return submitFilesSessionDAO.getSessionByID(sessionID);
 	}
 
-	public boolean releaseMarksForSession(Long sessionID){
+	public boolean releaseMarksForSession(Long sessionID) {
 		List list = submissionDetailsDAO.getSubmissionDetailsBySession(sessionID);
 		Iterator iter = list.iterator();
 		SubmissionDetails details;
 		SubmitFilesReport report;
-		
-		while(iter.hasNext()){
+		SubmitFilesSession session = getSessionById(sessionID);
+
+		SubmitFilesContent content = session.getContent();
+		boolean notifyLearnersOnMarkRelease = getEventNotificationService().eventExists(SbmtConstants.TOOL_SIGNATURE,
+				SbmtConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, content.getContentID());
+		Map<Long, StringBuilder> notificationMessages = null;
+		Object[] notificationMessageParameters = null;
+		if (notifyLearnersOnMarkRelease) {
+			notificationMessages = new TreeMap<Long, StringBuilder>();
+			notificationMessageParameters = new Object[3];
+		}
+		while (iter.hasNext()) {
 			details = (SubmissionDetails) iter.next();
 			report = details.getReport();
 			report.setDateMarksReleased(new Date());
+			if (notifyLearnersOnMarkRelease) {
+				SubmitUser user = details.getLearner();
+				StringBuilder notificationMessage = notificationMessages.get(user.getUserID().longValue());
+				if (notificationMessage == null) {
+					notificationMessage = new StringBuilder();
+				}
+				notificationMessageParameters[0] = details.getFilePath();
+				notificationMessageParameters[1] = details.getDateOfSubmission();
+				notificationMessageParameters[2] = report.getMarks();
+				notificationMessage.append(getLocalisedMessage("event.mark.release.mark", notificationMessageParameters));
+				notificationMessages.put(user.getUserID().longValue(), notificationMessage);
+			}
 			submitFilesReportDAO.updateReport(report);
 		}
 		//current there is no false return
+		if (notifyLearnersOnMarkRelease) {
+			notificationMessageParameters = new Object[1];
+			for (Long userID : notificationMessages.keySet()) {
+				notificationMessageParameters[0] = notificationMessages.get(userID).toString();
+				getEventNotificationService().triggerForSingleUser(SbmtConstants.TOOL_SIGNATURE,
+						SbmtConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, content.getContentID(), userID,
+						notificationMessageParameters);
+			}
+		}
 		return true;
 	}
-	public void finishSubmission(Long sessionID, Integer userID){
-		SubmitUser learner = submitUserDAO.getLearner(sessionID,userID);
+
+	public void finishSubmission(Long sessionID, Integer userID) {
+		SubmitUser learner = submitUserDAO.getLearner(sessionID, userID);
 		learner.setFinished(true);
 		submitUserDAO.saveOrUpdateUser(learner);
 	}
 
-    /* (non-Javadoc)
+	/* (non-Javadoc)
 	 * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#getToolDefaultContentIdBySignature(java.lang.Long)
-     */
-    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";
-    	    log.error(error);
-    	    throw new SubmitFilesException(error);
-    	}
-	    return contentId;
-    }
-    /* (non-Javadoc)
+	 */
+	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";
+			SubmitFilesService.log.error(error);
+			throw new SubmitFilesException(error);
+		}
+		return contentId;
+	}
+
+	/* (non-Javadoc)
 	 * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#createDefaultContent(java.lang.Long)
-     */
+	 */
 	public SubmitFilesContent createDefaultContent(Long contentID) {
-    	if (contentID == null)
-    	{
-    	    String error="Could not retrieve default content id for this tool";
-    	    log.error(error);
-    	    throw new SubmitFilesException(error);
-    	}
-    	SubmitFilesContent defaultContent = getDefaultSubmit();
-    	
-    	//save default content by given ID.
-    	SubmitFilesContent content = new SubmitFilesContent();
-    	content = SubmitFilesContent.newInstance(defaultContent,contentID,sbmtToolContentHandler); 
+		if (contentID == null) {
+			String error = "Could not retrieve default content id for this tool";
+			SubmitFilesService.log.error(error);
+			throw new SubmitFilesException(error);
+		}
+		SubmitFilesContent defaultContent = getDefaultSubmit();
+
+		//save default content by given ID.
+		SubmitFilesContent content = new SubmitFilesContent();
+		content = SubmitFilesContent.newInstance(defaultContent, contentID, sbmtToolContentHandler);
 		content.setContentID(contentID);
-    	
+
 		return content;
 	}
+
 	private SubmitFilesContent getDefaultSubmit() {
 		Long defaultToolContentId = getToolDefaultContentIdBySignature(SbmtConstants.TOOL_SIGNATURE);
-    	SubmitFilesContent defaultContent = getSubmitFilesContent(defaultToolContentId);
-    	if(defaultContent == null)
-    	{
-    	    String error="Could not retrieve default content record for this tool";
-    	    log.error(error);
-    	    throw new SubmitFilesException(error);
-    	}
+		SubmitFilesContent defaultContent = getSubmitFilesContent(defaultToolContentId);
+		if (defaultContent == null) {
+			String error = "Could not retrieve default content record for this tool";
+			SubmitFilesService.log.error(error);
+			throw new SubmitFilesException(error);
+		}
 		return defaultContent;
 	}
 
-    public List getSubmitFilesSessionByContentID(Long contentID) {
-        List learners = submitFilesSessionDAO.getSubmitFilesSessionByContentID(contentID);
-        if(learners == null)
-            learners = new ArrayList(); //return sized 0 list rather than null value
-        return learners;
-    }
-    
+	public List getSubmitFilesSessionByContentID(Long contentID) {
+		List learners = submitFilesSessionDAO.getSubmitFilesSessionByContentID(contentID);
+		if (learners == null) {
+			learners = new ArrayList(); //return sized 0 list rather than null value
+		}
+		return learners;
+	}
+
 	/* ===============Methods implemented from ToolContentImport102Manager =============== */
-	
 
-    /**
-     * Import the data for a 1.0.2 Noticeboard or HTMLNoticeboard
-     */
-    public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues)
-    {
-    	Date now = new Date();
-    	SubmitFilesContent toolContentObj = new SubmitFilesContent();
+	/**
+	 * Import the data for a 1.0.2 Noticeboard or HTMLNoticeboard
+	 */
+	public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) {
+		Date now = new Date();
+		SubmitFilesContent toolContentObj = new SubmitFilesContent();
 
-    	toolContentObj.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
-    	toolContentObj.setContentID(toolContentId);
-    	toolContentObj.setContentInUse(Boolean.FALSE);
-    	toolContentObj.setCreated(now);
-    	toolContentObj.setDefineLater(Boolean.FALSE);
-    	toolContentObj.setInstruction(WebUtil.convertNewlines((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)));
-    	toolContentObj.setOfflineInstruction(null);
-    	toolContentObj.setOnlineInstruction(null);
-    	toolContentObj.setRunOffline(Boolean.FALSE);
-    	toolContentObj.setUpdated(now);
-    	// 1.0.2 doesn't allow users to go back after completion, which is the equivalent of lock on finish.
-    	toolContentObj.setLockOnFinished(Boolean.TRUE);  
+		toolContentObj.setTitle((String) importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
+		toolContentObj.setContentID(toolContentId);
+		toolContentObj.setContentInUse(Boolean.FALSE);
+		toolContentObj.setCreated(now);
+		toolContentObj.setDefineLater(Boolean.FALSE);
+		toolContentObj.setInstruction(WebUtil
+				.convertNewlines((String) importValues.get(ToolContentImport102Manager.CONTENT_BODY)));
+		toolContentObj.setOfflineInstruction(null);
+		toolContentObj.setOnlineInstruction(null);
+		toolContentObj.setRunOffline(Boolean.FALSE);
+		toolContentObj.setUpdated(now);
+		// 1.0.2 doesn't allow users to go back after completion, which is the equivalent of lock on finish.
+		toolContentObj.setLockOnFinished(Boolean.TRUE);
 		toolContentObj.setReflectOnActivity(Boolean.FALSE);
-	    toolContentObj.setReflectInstructions(null);
+		toolContentObj.setReflectInstructions(null);
 
 		SubmitUser suser = createContentUser(user, toolContentId);
-    	toolContentObj.setCreatedBy(suser);
-    	
-    	// leave as empty, no need to set them to anything.
-    	//toolContentObj.setInstructionFiles(attachments);
-	
-    	submitFilesContentDAO.saveOrUpdate(toolContentObj);
-    }
+		toolContentObj.setCreatedBy(suser);
 
-    /** 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 {
-    	
-    	SubmitFilesContent toolContentObj = getSubmitFilesContent(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.");
-    	}
+		// leave as empty, no need to set them to anything.
+		//toolContentObj.setInstructionFiles(attachments);
 
-    	toolContentObj.setReflectOnActivity(Boolean.TRUE);
-    	toolContentObj.setReflectInstructions(description);
-    }
+		submitFilesContentDAO.saveOrUpdate(toolContentObj);
+	}
 
-    public SubmitUser getUserByUid(Long learnerID){
-    	return (SubmitUser) submitUserDAO.find(SubmitUser.class,learnerID);
-    	
-    }
-    public SubmitUser createSessionUser(UserDTO userDto, Long sessionID){
-    	SubmitUser learner = submitUserDAO.getLearner(sessionID, userDto.getUserID());
-    	if(learner != null)
-    		return learner;
-    	learner = new SubmitUser();
-    	learner.setUserID(userDto.getUserID());
-    	learner.setFirstName(userDto.getFirstName());
-    	learner.setLastName(userDto.getLastName());
-    	learner.setLogin(userDto.getLogin());
-    	learner.setSessionID(sessionID);
-    	learner.setFinished(false);
-    	
-    	submitUserDAO.saveOrUpdateUser(learner);
-    	
-    	return learner;
-    }
+	/** 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 {
+
+		SubmitFilesContent toolContentObj = getSubmitFilesContent(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.");
+		}
+
+		toolContentObj.setReflectOnActivity(Boolean.TRUE);
+		toolContentObj.setReflectInstructions(description);
+	}
+
+	public SubmitUser getUserByUid(Long learnerID) {
+		return (SubmitUser) submitUserDAO.find(SubmitUser.class, learnerID);
+
+	}
+
+	public SubmitUser createSessionUser(UserDTO userDto, Long sessionID) {
+		SubmitUser learner = submitUserDAO.getLearner(sessionID, userDto.getUserID());
+		if (learner != null) {
+			return learner;
+		}
+		learner = new SubmitUser();
+		learner.setUserID(userDto.getUserID());
+		learner.setFirstName(userDto.getFirstName());
+		learner.setLastName(userDto.getLastName());
+		learner.setLogin(userDto.getLogin());
+		learner.setSessionID(sessionID);
+		learner.setFinished(false);
+
+		submitUserDAO.saveOrUpdateUser(learner);
+
+		return learner;
+	}
+
 	public SubmitUser getSessionUser(Long sessionID, Integer userID) {
-		return submitUserDAO.getLearner(sessionID,userID);
+		return submitUserDAO.getLearner(sessionID, userID);
 	}
+
 	public SubmitUser createContentUser(UserDTO userDto, Long contentId) {
 		SubmitUser learner = submitUserDAO.getContentUser(contentId, userDto.getUserID());
-    	if(learner != null)
-    		return learner;
-    	learner = new SubmitUser();
-    	learner.setUserID(userDto.getUserID());
-    	learner.setFirstName(userDto.getFirstName());
-    	learner.setLastName(userDto.getLastName());
-    	learner.setLogin(userDto.getLogin());
-    	learner.setContentID(contentId);
-    	learner.setFinished(false);
-    	
-    	submitUserDAO.saveOrUpdateUser(learner);
-    	return learner;
-    	
+		if (learner != null) {
+			return learner;
+		}
+		learner = new SubmitUser();
+		learner.setUserID(userDto.getUserID());
+		learner.setFirstName(userDto.getFirstName());
+		learner.setLastName(userDto.getLastName());
+		learner.setLogin(userDto.getLogin());
+		learner.setContentID(contentId);
+		learner.setFinished(false);
+
+		submitUserDAO.saveOrUpdateUser(learner);
+		return learner;
+
 	}
+
 	public SubmitUser getContentUser(Long contentId, Integer userID) {
-		return submitUserDAO.getContentUser(contentId,userID);
+		return submitUserDAO.getContentUser(contentId, userID);
 	}
 
 	/***************************************************************************
@@ -918,37 +994,32 @@
 	 * @param submitFilesContentDAO
 	 *            The submitFilesContentDAO to set.
 	 */
-	public void setSubmitFilesContentDAO(
-			ISubmitFilesContentDAO submitFilesContentDAO) {
+	public void setSubmitFilesContentDAO(ISubmitFilesContentDAO submitFilesContentDAO) {
 		this.submitFilesContentDAO = submitFilesContentDAO;
 	}
 
 	/**
 	 * @param submitFilesReportDAO
 	 *            The submitFilesReportDAO to set.
 	 */
-	public void setSubmitFilesReportDAO(
-			ISubmitFilesReportDAO submitFilesReportDAO) {
+	public void setSubmitFilesReportDAO(ISubmitFilesReportDAO submitFilesReportDAO) {
 		this.submitFilesReportDAO = submitFilesReportDAO;
 	}
 
 	/**
 	 * @param submitFilesSessionDAO
 	 *            The submitFilesSessionDAO to set.
 	 */
-	public void setSubmitFilesSessionDAO(
-			ISubmitFilesSessionDAO submitFilesSessionDAO) {
+	public void setSubmitFilesSessionDAO(ISubmitFilesSessionDAO submitFilesSessionDAO) {
 		this.submitFilesSessionDAO = submitFilesSessionDAO;
 	}
-	
+
 	/**
 	 * @param submissionDetailsDAO The submissionDetailsDAO to set.
 	 */
-	public void setSubmissionDetailsDAO(
-			ISubmissionDetailsDAO submissionDetailsDAO) {
+	public void setSubmissionDetailsDAO(ISubmissionDetailsDAO submissionDetailsDAO) {
 		this.submissionDetailsDAO = submissionDetailsDAO;
 	}
-	
 
 	/**
 	 * @return Returns the sbmtToolContentHandler.
@@ -963,7 +1034,7 @@
 	public void setSbmtToolContentHandler(IToolContentHandler sbmtToolContentHandler) {
 		this.sbmtToolContentHandler = sbmtToolContentHandler;
 	}
-	
+
 	/**
 	 * @return Returns the learnerDAO.
 	 */
@@ -975,7 +1046,7 @@
 	 * @param learnerDAO The learnerDAO to set.
 	 */
 	public void setSubmitUserDAO(ISubmitUserDAO learnerDAO) {
-		this.submitUserDAO = learnerDAO;
+		submitUserDAO = learnerDAO;
 	}
 
 	public ILearnerService getLearnerService() {
@@ -993,22 +1064,44 @@
 	public void setToolService(ILamsToolService toolService) {
 		this.toolService = toolService;
 	}
+
 	public IExportToolContentService getExportContentService() {
 		return exportContentService;
 	}
+
 	public void setExportContentService(IExportToolContentService exportContentService) {
 		this.exportContentService = exportContentService;
 	}
+
 	public ICoreNotebookService getCoreNotebookService() {
 		return coreNotebookService;
 	}
+
 	public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
 		this.coreNotebookService = coreNotebookService;
 	}
+
 	public void setAttachmentDAO(IAttachmentDAO attachmentDAO) {
 		this.attachmentDAO = attachmentDAO;
 	}
+
 	public void setUserManagementService(IUserManagementService userManagementService) {
 		this.userManagementService = userManagementService;
 	}
+
+	public IEventNotificationService getEventNotificationService() {
+		return eventNotificationService;
+	}
+
+	public void setEventNotificationService(IEventNotificationService eventNotificationService) {
+		this.eventNotificationService = eventNotificationService;
+	}
+
+	public String getLocalisedMessage(String key, Object[] args) {
+		return messageService.getMessage(key, args);
+	}
+
+	public void setMessageService(MessageService messageService) {
+		this.messageService = messageService;
+	}
 }
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
diff -u -rb318437288a6761c6e176c89974773e231bfbc87 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision b318437288a6761c6e176c89974773e231bfbc87)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -68,7 +68,8 @@
 		<property name="exportContentService"><ref bean="exportToolContentService"/></property>
 		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>		
 		<property name="userManagementService"><ref bean="userManagementService"/></property>
-		
+		<property name="messageService"><ref bean="sbmtMessageService"/></property>
+		<property name="eventNotificationService"><ref bean="eventNotificationService"/></property> 
 	</bean>
 	
 	<bean id="submitFilesService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
===================================================================
diff -u -r82513de88ed468a1efaa3f5cced49157933767f3 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(.../SbmtConstants.java)	(revision 82513de88ed468a1efaa3f5cced49157933767f3)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(.../SbmtConstants.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -21,40 +21,57 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 
 package org.lamsfoundation.lams.tool.sbmt.util;
 
 public class SbmtConstants {
 
 	public static final String TOOL_SIGNATURE = "lasbmt11";
+
 	public static final String DEFAULT_TITLE = "Submit Files Title";
 
 	public static final String AUTHORING_DTO = "authoring";
 
-//	public static final String TOOL_SESSION_ID = "toolSessionID";
-//	public static final String TOOL_CONTENT_ID = "toolContentID";
+	//	public static final String TOOL_SESSION_ID = "toolSessionID";
+	//	public static final String TOOL_CONTENT_ID = "toolContentID";
 	public static final String USER_ID = "userID";
-	
+
 	public static final String ATTACHMENT_LIST = "attachmentList";
+
 	public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList";
+
 	public static final String PAGE_EDITABLE = "isPageEditable";
+
 	public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag";
 
 	public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
+
 	public static final String ATTR_USER_UID = "userUid";
+
 	public static final String SUCCESS = "success";
+
 	public static final String ATTR_FINISH_LOCK = "finishLock";
+
 	public static final String ATTR_REFLECTION_ON = "reflectOn";
+
 	public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions";
+
 	public static final String ATTR_TITLE = "title";
+
 	public static final String ATTR_INSTRUCTION = "instruction";
+
 	public static final String ATTR_LOCK_ON_FINISH = "lockOnFinish";
+
 	public static final String PARAM_MIN_UPLOAD = "minUpload";
+
 	public static final String ATTR_LIMIT_UPLOAD = "limitUpload";
+
 	public static final String ATTR_LIMIT_UPLOAD_NUMBER = "limitUploadNumber";
+
 	public static final Object ATTR_ARRIVE_LIMIT = "arriveLimit";
+
 	public static final String ATTR_USER_FINISHED = "userFinished";
 
+	public static final String EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE = "notify_learners_on_mark_release";
 }
-
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
diff -u -r7dd15ff5149a5f87efd7cef5304819bf1bd0b78f -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7dd15ff5149a5f87efd7cef5304819bf1bd0b78f)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -21,7 +21,7 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 
 package org.lamsfoundation.lams.tool.sbmt.web;
 
@@ -43,7 +43,6 @@
 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.upload.FormFile;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
@@ -56,7 +55,6 @@
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
-import org.lamsfoundation.lams.tool.sbmt.util.SbmtWebUtils;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
@@ -82,7 +80,7 @@
 	private Logger log = Logger.getLogger(AuthoringAction.class);
 
 	public ISubmitFilesService submitFilesService;
-	
+
 	/**
 	 * This page will display initial submit tool content. Or just a blank page if the toolContentID does not
 	 * exist before.
@@ -94,37 +92,40 @@
 	 *      javax.servlet.http.HttpServletRequest,
 	 *      javax.servlet.http.HttpServletResponse)
 	 */
-	protected ActionForward unspecified(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
+	@Override
+	protected ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
 
 		ToolAccessMode mode = null;
-		try{
-			mode =  WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE,true);
-		}catch(Exception e){
+		try {
+			mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
 		}
+		catch (Exception e) {
+		}
 		//when first time open flash icon on authoring page: mode will be null 
-		if(mode == null)
+		if (mode == null) {
 			mode = ToolAccessMode.AUTHOR;
-		
+		}
+
 		SessionMap sessionMap = new SessionMap();
 		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
-		
-		Long contentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+
+		Long contentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 		//get back the upload file list and display them on page
 		submitFilesService = getService();
-		
+
 		SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(contentID);
-		
-		if(mode.isTeacher()){
 
+		if (mode.isTeacher()) {
+
 			persistContent.setDefineLater(true);
 			submitFilesService.saveOrUpdateContent(persistContent);
-			
+
 		}
-		
+
 		//if this content does not exist(empty without id), create a content by default content record.
-		if(persistContent == null){
+		if (persistContent == null) {
 			persistContent = submitFilesService.createDefaultContent(contentID);
 		}
 
@@ -134,7 +135,7 @@
 		attachmentList.addAll(persistContent.getInstructionFiles());
 		List delAttachmentList = getDeletedAttachmentList(sessionMap);
 		delAttachmentList.clear();
-		
+
 		//set back STRUTS component value
 		AuthoringForm authForm = (AuthoringForm) form;
 		authForm.initContentValue(persistContent);
@@ -143,11 +144,10 @@
 		//current tab
 		authForm.setCurrentTab(request.getParameter("currentTab"));
 		authForm.setContentFolderID(contentFolderID);
-		
+
 		return mapping.findForward("success");
 	}
 
-	
 	/**
 	 * Update all content for submit tool except online/offline instruction files list. 
 	 *  
@@ -160,89 +160,94 @@
 	 * @throws InvocationTargetException 
 	 * @throws Exception 
 	 */
-	public ActionForward updateContent(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public ActionForward updateContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws Exception {
 
 		AuthoringForm authForm = (AuthoringForm) form;
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(authForm.getSessionMapID());
-		
+
 		ToolAccessMode mode = null;
-		try{
-			mode =  WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE,true);
-		}catch(Exception e){
+		try {
+			mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
 		}
+		catch (Exception e) {
+		}
 		//when first time open flash icon on authoring page: mode will be null 
-		if(mode == null)
+		if (mode == null) {
 			mode = ToolAccessMode.AUTHOR;
-		
+		}
+
 		ActionMessages errors = validate(authForm, mapping, request);
-		if(!errors.isEmpty()){
+		if (!errors.isEmpty()) {
 			saveErrors(request, errors);
 			return mapping.getInputForward();
 		}
-		
+
 		SubmitFilesContent content = getContent(form);
-		
+
 		submitFilesService = getService();
 		SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(content.getContentID());
-		
-		if(persistContent == null){
+
+		if (persistContent == null) {
 			//new content
 			persistContent = content;
 			content.setCreated(new Date());
-		}else{
+		}
+		else {
 			//copy web page value into persist content, as above, the "Set" type value kept.
-			if(mode.isAuthor()){
+			if (mode.isAuthor()) {
 				Long uid = persistContent.getContentID();
-				PropertyUtils.copyProperties(persistContent,content);
+				PropertyUtils.copyProperties(persistContent, content);
 				persistContent.setContentID(uid);
-			}else{
-//			    if it is Teacher, then just update basic tab content (definelater)
+			}
+			else {
+				//			    if it is Teacher, then just update basic tab content (definelater)
 				persistContent.setInstruction(content.getInstruction());
 				persistContent.setTitle(content.getTitle());
 				//change define later status
 				persistContent.setDefineLater(false);
 			}
 		}
-//		*******************************Handle user*******************
+		//		*******************************Handle user*******************
 		//get session from shared session.
 		HttpSession ss = SessionManager.getSession();
 		//get back login user DTO
 		UserDTO userDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
-		
+
 		Long contentId = authForm.getToolContentID();
-		SubmitUser user = submitFilesService.getContentUser(contentId,userDto.getUserID());
-		if(user == null){
+		SubmitUser user = submitFilesService.getContentUser(contentId, userDto.getUserID());
+		if (user == null) {
 			user = submitFilesService.createContentUser(userDto, contentId);
 		}
 		persistContent.setCreatedBy(user);
-		
+
 		//**********************************Handle Authoring Instruction Attachement *********************
-//		so far, attPOSet will be empty if content is existed. because PropertyUtils.copyProperties() is executed
+		//		so far, attPOSet will be empty if content is existed. because PropertyUtils.copyProperties() is executed
 		Set attPOSet = persistContent.getInstructionFiles();
-		if(attPOSet == null)
+		if (attPOSet == null) {
 			attPOSet = new HashSet();
-		
+		}
+
 		//get Attachment from HttpSession
 		List attachmentList = getAttachmentList(sessionMap);
 		Iterator iter = attachmentList.iterator();
-		while(iter.hasNext()){
+		while (iter.hasNext()) {
 			InstructionFiles newAtt = (InstructionFiles) iter.next();
 			attPOSet.add(newAtt);
 		}
 		attachmentList.clear();
-		
+
 		//handle deleted instruction files
 		List deleteAttachmentList = getDeletedAttachmentList(sessionMap);
 		iter = deleteAttachmentList.iterator();
-		while(iter.hasNext()){
+		while (iter.hasNext()) {
 			InstructionFiles delAtt = (InstructionFiles) iter.next();
 			//it is an existed att, then delete it from current attachmentPO
-			if(delAtt.getUid() != null){
+			if (delAtt.getUid() != null) {
 				Iterator attIter = attPOSet.iterator();
-				while(attIter.hasNext()){
+				while (attIter.hasNext()) {
 					InstructionFiles att = (InstructionFiles) attIter.next();
-					if(delAtt.getUid().equals(att.getUid())){
+					if (delAtt.getUid().equals(att.getUid())) {
 						attIter.remove();
 						break;
 					}
@@ -251,16 +256,17 @@
 			}//end remove from persist value
 		}
 		deleteAttachmentList.clear();
-		
+
 		//copy back
 		persistContent.setInstructionFiles(attPOSet);
-		
+
 		submitFilesService.saveOrUpdateContent(persistContent);
-		
+
 		//to jump to common success page in lams_central
-		request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE);
+		request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 		return mapping.findForward("success");
 	}
+
 	/**
 	 * Handle upload online instruction files request. Once the file uploaded successfully, database
 	 * will update accordingly. 
@@ -271,10 +277,11 @@
 	 * @param response
 	 * @return
 	 */
-	public ActionForward uploadOnline(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		return uploadFile(mapping, form, IToolContentHandler.TYPE_ONLINE,request);
+	public ActionForward uploadOnline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		return uploadFile(mapping, form, IToolContentHandler.TYPE_ONLINE, request);
 	}
+
 	/**
 	 * Handle upload offline instruction files request. Once the file uploaded successfully, database
 	 * will update accordingly. 
@@ -284,10 +291,11 @@
 	 * @param response
 	 * @return
 	 */
-	public ActionForward uploadOffline(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		return uploadFile(mapping, form, IToolContentHandler.TYPE_OFFLINE,request);
+	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
@@ -296,35 +304,36 @@
 	 * @param request
 	 * @return
 	 */
-	private ActionForward uploadFile(ActionMapping mapping, ActionForm form,
-			String type,HttpServletRequest request) {
+	private ActionForward uploadFile(ActionMapping mapping, ActionForm form, String type, HttpServletRequest request) {
 
 		AuthoringForm authForm = (AuthoringForm) form;
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(authForm.getSessionMapID());
-		
+
 		FormFile file;
-		if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type))
-			file = (FormFile) authForm.getOfflineFile();
-		else
-			file = (FormFile) authForm.getOnlineFile();
-		
-		if(file == null || StringUtils.isBlank(file.getFileName()))
+		if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
+			file = authForm.getOfflineFile();
+		}
+		else {
+			file = authForm.getOnlineFile();
+		}
+
+		if (file == null || StringUtils.isBlank(file.getFileName())) {
 			return mapping.getInputForward();
-			
+		}
+
 		//upload to repository
 		InstructionFiles att = submitFilesService.uploadFileToContent(authForm.getToolContentID(), 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();
 		InstructionFiles existAtt;
-		while(iter.hasNext()){
+		while (iter.hasNext()) {
 			existAtt = (InstructionFiles) iter.next();
-			if (StringUtils.equals(existAtt.getName(), att.getName())
-					&& StringUtils.equals(existAtt.getType(), att.getType())) {
+			if (StringUtils.equals(existAtt.getName(), att.getName()) && StringUtils.equals(existAtt.getType(), att.getType())) {
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();
@@ -333,18 +342,19 @@
 		}
 		//add to attachmentList
 		attachmentList.add(att);
-		
+
 		return mapping.getInputForward();
 
 	}
 
-	public ActionForward deleteOfflineFile(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		return deleteFile(mapping, form,request, response,IToolContentHandler.TYPE_OFFLINE);
+	public ActionForward deleteOfflineFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		return deleteFile(mapping, form, request, response, IToolContentHandler.TYPE_OFFLINE);
 	}
-	public ActionForward deleteOnlineFile(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		return deleteFile(mapping, form,request, response,IToolContentHandler.TYPE_ONLINE);
+
+	public ActionForward deleteOnlineFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		return deleteFile(mapping, form, request, response, IToolContentHandler.TYPE_ONLINE);
 	}
 
 	/**
@@ -353,28 +363,29 @@
 	 * @param type 
 	 * @return
 	 */
-	private ActionForward deleteFile(ActionMapping mapping,ActionForm form,HttpServletRequest request, HttpServletResponse response, String type) {
-		Long versionID = new Long(WebUtil.readLongParam(request,"fileVersionId"));
-		Long uuID = new Long(WebUtil.readLongParam(request,"fileUuid"));
+	private ActionForward deleteFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response, String type) {
+		Long versionID = new Long(WebUtil.readLongParam(request, "fileVersionId"));
+		Long uuID = new Long(WebUtil.readLongParam(request, "fileUuid"));
 		String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.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();
 		InstructionFiles existAtt;
-		while(iter.hasNext()){
+		while (iter.hasNext()) {
 			existAtt = (InstructionFiles) iter.next();
-			if(existAtt.getUuID().equals(uuID) && existAtt.getVersionID().equals(versionID)){
+			if (existAtt.getUuID().equals(uuID) && existAtt.getVersionID().equals(versionID)) {
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();
 			}
 		}
-		
+
 		request.setAttribute(SbmtConstants.ATTR_FILE_TYPE_FLAG, type);
 		request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 		return mapping.findForward("instructionFileList");
@@ -392,80 +403,84 @@
 	private SubmitFilesContent getContent(ActionForm form) {
 		AuthoringForm authForm = (AuthoringForm) form;
 		Long contentId = authForm.getToolContentID();
-		
+
 		SubmitFilesContent content = new SubmitFilesContent();
 		content.setContentID(contentId);
 		content.setInstruction(authForm.getInstructions());
 		content.setOfflineInstruction(authForm.getOfflineInstruction());
 		content.setOnlineInstruction(authForm.getOnlineInstruction());
 		content.setTitle(authForm.getTitle());
-		content.setLockOnFinished( authForm.isLockOnFinished());
+		content.setLockOnFinished(authForm.isLockOnFinished());
 		content.setReflectInstructions(authForm.getReflectInstructions());
 		content.setReflectOnActivity(authForm.isReflectOnActivity());
 		content.setLimitUpload(authForm.isLimitUpload());
 		content.setLimitUploadNumber(authForm.getLimitUploadNumber());
+		content.setNotifyLearnersOnMarkRelease(authForm.isNotifyLearnersOnMarkRelease());
 		// content.setInstrctionFiles()
 		// content.setToolSession();
 		return content;
 	}
+
 	/**
 	 * @param request
 	 * @return
 	 */
 	private List getAttachmentList(SessionMap sessionMap) {
-		return getListFromSession(sessionMap,SbmtConstants.ATTACHMENT_LIST);
+		return getListFromSession(sessionMap, SbmtConstants.ATTACHMENT_LIST);
 	}
+
 	/**
 	 * @param request
 	 * @return
 	 */
 	private List getDeletedAttachmentList(SessionMap sessionMap) {
-		return getListFromSession(sessionMap,SbmtConstants.DELETED_ATTACHMENT_LIST);
+		return getListFromSession(sessionMap, SbmtConstants.DELETED_ATTACHMENT_LIST);
 	}
+
 	/**
 	 * Get <code>java.util.List</code> from HttpSession by given name.
 	 * 
 	 * @param request
 	 * @param name
 	 * @return
 	 */
-	private List getListFromSession(SessionMap sessionMap,String name) {
+	private List getListFromSession(SessionMap sessionMap, String name) {
 		List list = (List) sessionMap.get(name);
-		if(list == null){
+		if (list == null) {
 			list = new ArrayList();
-			sessionMap.put(name,list);
+			sessionMap.put(name, list);
 		}
 		return list;
 	}
-	
 
 	/**
 	 * Get submit file service bean.
 	 * @return
 	 */
 	private ISubmitFilesService getService() {
-		if(submitFilesService == null)
+		if (submitFilesService == null) {
 			return SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
-		else
+		}
+		else {
 			return submitFilesService;
+		}
 	}
-		
+
 	private ActionMessages validate(AuthoringForm sbmtForm, ActionMapping mapping, HttpServletRequest request) {
 		ActionMessages errors = new ActionMessages();
-//		if (StringUtils.isBlank(sbmtForm.getTitle())) {
-//			ActionMessage error = new ActionMessage("error.title.blank");
-//			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-//		}
+		//		if (StringUtils.isBlank(sbmtForm.getTitle())) {
+		//			ActionMessage error = new ActionMessage("error.title.blank");
+		//			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+		//		}
 		//define it later mode(TEACHER) skip below validation.
 		String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
-		if(StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())){
+		if (StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())) {
 			return errors;
 		}
 
 		//Some other validation outside basic Tab.
-		
+
 		return errors;
 	}
 
-
 }
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -rc42af5aa9a4d6851af66bbeaf381b9e21fa77c23 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision c42af5aa9a4d6851af66bbeaf381b9e21fa77c23)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -21,7 +21,7 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 
 package org.lamsfoundation.lams.tool.sbmt.web;
 
@@ -43,6 +43,7 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.actions.DispatchAction;
 import org.apache.struts.upload.FormFile;
+import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -86,11 +87,11 @@
  * 
  */
 public class LearnerAction extends DispatchAction {
-    
-    private static final boolean MODE_OPTIONAL = false;
-    
+
+	private static final boolean MODE_OPTIONAL = false;
+
 	public static Logger logger = Logger.getLogger(LearnerAction.class);
-    
+
 	/**
 	 * The initial page of learner in Submission tool. This page will list all uploaded files and learn 
 	 * @param mapping
@@ -99,85 +100,97 @@
 	 * @param response
 	 * @return
 	 */
-    public ActionForward unspecified(
-            ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response)
-    {
-    	//initial session Map
-    	SessionMap sessionMap = new SessionMap();
+	@Override
+	public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		//initial session Map
+		SessionMap sessionMap = new SessionMap();
 		request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 		request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-		((LearnerForm)form).setSessionMapID(sessionMap.getSessionID());
-		
-        //get parameters from Request
+		((LearnerForm) form).setSessionMapID(sessionMap.getSessionID());
+
+		//get parameters from Request
 		ToolAccessMode mode = null;
-		try{
-			mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE,MODE_OPTIONAL);
-		}catch(Exception e){}
-		if(mode == null) mode = ToolAccessMode.LEARNER;
-        
-		Long sessionID =  new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID));
-		
+		try {
+			mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, LearnerAction.MODE_OPTIONAL);
+		}
+		catch (Exception e) {
+		}
+		if (mode == null) {
+			mode = ToolAccessMode.LEARNER;
+		}
+
+		Long sessionID = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID));
+
 		//get session from shared session.
 		HttpSession ss = SessionManager.getSession();
-		
+
 		Integer userID = null;
-		if ( mode != null && mode.isTeacher() ) {
+		if (mode != null && mode.isTeacher()) {
 			//monitoring mode - user is specified in URL
 			userID = WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID, false);
-		} else {
+		}
+		else {
 			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 			userID = user.getUserID();
 		}
 
-		
 		ISubmitFilesService submitFilesService = getService();
 		SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
 		SubmitFilesContent content = session.getContent();
 
 		//this must before getFileUploadByUser() method becuase getCurrentLearner() 
 		// will create session user if it does not exist.
 		SubmitUser learner = getCurrentLearner(sessionID, submitFilesService);
-		List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID,request.getLocale());
-		
-//		check whehter finish lock is on/off
+		List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale());
+
+		//		check whehter finish lock is on/off
 		boolean lock = content.isLockOnFinished() && learner.isFinished();
-		
+
 		sessionMap.put(AttributeNames.PARAM_MODE, mode);
 		sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
 		sessionMap.put(SbmtConstants.ATTR_FINISH_LOCK, lock);
 		sessionMap.put(SbmtConstants.ATTR_LOCK_ON_FINISH, content.isLockOnFinished());
-		sessionMap.put(SbmtConstants.ATTR_REFLECTION_ON,content.isReflectOnActivity());
-		sessionMap.put(SbmtConstants.ATTR_REFLECTION_INSTRUCTION,content.getReflectInstructions());
-		sessionMap.put(SbmtConstants.ATTR_TITLE,content.getTitle());
-		sessionMap.put(SbmtConstants.ATTR_INSTRUCTION,content.getInstruction());
-		sessionMap.put(SbmtConstants.ATTR_LIMIT_UPLOAD,content.isLimitUpload());
-		sessionMap.put(SbmtConstants.ATTR_LIMIT_UPLOAD_NUMBER,content.getLimitUploadNumber());
+		sessionMap.put(SbmtConstants.ATTR_REFLECTION_ON, content.isReflectOnActivity());
+		sessionMap.put(SbmtConstants.ATTR_REFLECTION_INSTRUCTION, content.getReflectInstructions());
+		sessionMap.put(SbmtConstants.ATTR_TITLE, content.getTitle());
+		sessionMap.put(SbmtConstants.ATTR_INSTRUCTION, content.getInstruction());
+		sessionMap.put(SbmtConstants.ATTR_LIMIT_UPLOAD, content.isLimitUpload());
+		sessionMap.put(SbmtConstants.ATTR_LIMIT_UPLOAD_NUMBER, content.getLimitUploadNumber());
 		sessionMap.put(SbmtConstants.ATTR_USER_FINISHED, learner.isFinished());
-		
+
 		setLearnerDTO(request, sessionMap, learner, filesUploaded, mode);
-		
+
 		//if content in use, return special page.
-		if(content.isDefineLater()){
+		if (content.isDefineLater()) {
 			return mapping.findForward("defineLater");
 		}
-		
+
 		//set contentInUse flag to true!
 		content.setContentInUse(true);
 		content.setDefineLater(false);
 		submitFilesService.saveOrUpdateContent(content);
-		
+
 		//add run offline support
-		if(content.isRunOffline()){
-			return mapping.findForward("runOffline");		
+		if (content.isRunOffline()) {
+			return mapping.findForward("runOffline");
 		}
-		
-		return mapping.findForward(SbmtConstants.SUCCESS);
-    }
 
+		if (content.isNotifyLearnersOnMarkRelease()) {
+			submitFilesService.getEventNotificationService().createEvent(SbmtConstants.TOOL_SIGNATURE,
+					SbmtConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, content.getContentID(),
+					submitFilesService.getLocalisedMessage("event.mark.release.subject", null),
+					submitFilesService.getLocalisedMessage("event.mark.release.body", null));
 
+			submitFilesService.getEventNotificationService().subscribe(SbmtConstants.TOOL_SIGNATURE,
+					SbmtConstants.EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE, content.getContentID(),
+					learner.getUserID().longValue(), IEventNotificationService.DELIVERY_METHOD_MAIL,
+					IEventNotificationService.PERIODICITY_SINGLE);
+		}
+
+		return mapping.findForward(SbmtConstants.SUCCESS);
+	}
+
 	/**
 	 * Implements learner upload submission function. This function also display the page again for learner uploading
 	 * more submission use. 
@@ -187,60 +200,55 @@
 	 * @param response
 	 * @return
 	 */
-	public ActionForward uploadFile(ActionMapping mapping,
-									ActionForm form,
-									HttpServletRequest request,
-									HttpServletResponse response){
-		
-		LearnerForm learnerForm= (LearnerForm)form;
+	public ActionForward uploadFile(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+
+		LearnerForm learnerForm = (LearnerForm) form;
 		String sessionMapID = learnerForm.getSessionMapID();
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 		request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-		
-		 //set the mode into http session 
-        Long sessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
-       	
-		if(validateUploadForm(learnerForm,request)){
+
+		//set the mode into http session 
+		Long sessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+
+		if (validateUploadForm(learnerForm, request)) {
 			//get session from shared session.
 			HttpSession ss = SessionManager.getSession();
 			//get back login user DTO
 			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 			Integer userID = user.getUserID();
-			
+
 			ISubmitFilesService submitFilesService = getService();
-			List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID,request.getLocale());
+			List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale());
 
 			SubmitUser learner = getCurrentLearner(sessionID, submitFilesService);
 			ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
-			setLearnerDTO(request,sessionMap, learner, filesUploaded, mode);
-			
+			setLearnerDTO(request, sessionMap, learner, filesUploaded, mode);
+
 			return mapping.getInputForward();
 		}
-		
+
 		//get session from shared session.
 		HttpSession ss = SessionManager.getSession();
 		//get back login user DTO
 		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 		Integer userID = user.getUserID();
-		
-		
-		FormFile uploadedFile=  learnerForm.getFile();
-		String fileDescription =  learnerForm.getDescription();
+
+		FormFile uploadedFile = learnerForm.getFile();
+		String fileDescription = learnerForm.getDescription();
 		//reset fields and display a new form for next new file upload
 		learnerForm.setDescription("");
-		
+
 		ISubmitFilesService submitFilesService = getService();
 
-		submitFilesService.uploadFileToSession(sessionID,uploadedFile,fileDescription,userID);
-		List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID,request.getLocale());
+		submitFilesService.uploadFileToSession(sessionID, uploadedFile, fileDescription, userID);
+		List filesUploaded = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale());
 		SubmitUser learner = getCurrentLearner(sessionID, submitFilesService);
 		ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
-		setLearnerDTO(request,sessionMap, learner, filesUploaded, mode);
-		return mapping.getInputForward();			
+		setLearnerDTO(request, sessionMap, learner, filesUploaded, mode);
+		return mapping.getInputForward();
 	}
 
-
-
 	/**
 	 * Learner choose finish upload button, will invoke this function. This function will mark the <code>finished</code> 
 	 * field by special toolSessionID and userID.
@@ -251,20 +259,18 @@
 	 * @param response
 	 * @return
 	 */
-	public ActionForward finish(ActionMapping mapping,
-			ActionForm form,
-			HttpServletRequest request,
-			HttpServletResponse response){
-		
+	public ActionForward finish(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+
 		String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 		request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-		
+
 		ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
 		Long sessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
-		
-		if (mode == ToolAccessMode.LEARNER || mode.equals(ToolAccessMode.AUTHOR) ) {
-			ToolSessionManager sessionMgrService = SubmitFilesServiceProxy.getToolSessionManager(getServlet().getServletContext());
+
+		if (mode == ToolAccessMode.LEARNER || mode.equals(ToolAccessMode.AUTHOR)) {
+			ToolSessionManager sessionMgrService = SubmitFilesServiceProxy
+					.getToolSessionManager(getServlet().getServletContext());
 			ISubmitFilesService submitFilesService = getService();
 
 			//get back login user DTO
@@ -278,54 +284,60 @@
 			try {
 				nextActivityUrl = sessionMgrService.leaveToolSession(sessionID, new Long(userID.intValue()));
 				response.sendRedirect(nextActivityUrl);
-			} catch (DataMissingException e) {
+			}
+			catch (DataMissingException e) {
 				throw new SubmitFilesException(e);
-			} catch (ToolException e) {
+			}
+			catch (ToolException e) {
 				throw new SubmitFilesException(e);
-			} catch (IOException e) {
+			}
+			catch (IOException e) {
 				throw new SubmitFilesException(e);
 			}
 		}
 		return null;
-		
+
 	}
-	
+
 	//**********************************************************************************************
 	//		Private mehtods
 	//**********************************************************************************************
 	private ISubmitFilesService getService() {
-		ISubmitFilesService submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
+		ISubmitFilesService submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet()
+				.getServletContext());
 		return submitFilesService;
 	}
-	
+
 	//validate uploaded form
 	private boolean validateUploadForm(LearnerForm learnerForm, HttpServletRequest request) {
 		ActionMessages errors = new ActionMessages();
 		Locale preferredLocale = (Locale) request.getSession().getAttribute(LocaleFilter.PREFERRED_LOCALE_KEY);
-		if(learnerForm.getFile() == null || StringUtils.isBlank(learnerForm.getFile().getFileName())){
-			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.required",
-					this.getResources(request).getMessage(preferredLocale,"learner.form.filepath.displayname")));
+		if (learnerForm.getFile() == null || StringUtils.isBlank(learnerForm.getFile().getFileName())) {
+			errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("errors.required", this.getResources(request).getMessage(
+					preferredLocale, "learner.form.filepath.displayname")));
 		}
-		if(StringUtils.isBlank(learnerForm.getDescription())){
-			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.required",
-					this.getResources(request).getMessage(preferredLocale,"label.learner.fileDescription")));
-		} else if ( learnerForm.getDescription().length() > LearnerForm.DESCRIPTION_LENGTH ) {
-			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.maxdescsize", LearnerForm.DESCRIPTION_LENGTH));
+		if (StringUtils.isBlank(learnerForm.getDescription())) {
+			errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("errors.required", this.getResources(request).getMessage(
+					preferredLocale, "label.learner.fileDescription")));
 		}
-		
-		FileValidatorUtil.validateFileSize(learnerForm.getFile(),false,errors);
-		
-		if(learnerForm.getFile() != null)
-			log.debug("Learner submit file : " + learnerForm.getFile().getFileName());
-		
-    	if(learnerForm.getFile()!= null && FileUtil.isExecutableFile(learnerForm.getFile().getFileName())){
-    		log.debug("File is executatable : " + learnerForm.getFile().getFileName());
-        	ActionMessage msg = new ActionMessage("error.attachment.executable");
-        	errors.add(ActionMessages.GLOBAL_MESSAGE, msg);
-    	}
-    	
-		if(!errors.isEmpty()){
-			this.addErrors(request,errors);
+		else if (learnerForm.getDescription().length() > LearnerForm.DESCRIPTION_LENGTH) {
+			errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("errors.maxdescsize", LearnerForm.DESCRIPTION_LENGTH));
+		}
+
+		FileValidatorUtil.validateFileSize(learnerForm.getFile(), false, errors);
+
+		if (learnerForm.getFile() != null) {
+			DispatchAction.log.debug("Learner submit file : " + learnerForm.getFile().getFileName());
+		}
+
+		if (learnerForm.getFile() != null && FileUtil.isExecutableFile(learnerForm.getFile().getFileName())) {
+			DispatchAction.log.debug("File is executatable : " + learnerForm.getFile().getFileName());
+			ActionMessage msg = new ActionMessage("error.attachment.executable");
+			errors.add(ActionMessages.GLOBAL_MESSAGE, msg);
+		}
+
+		if (!errors.isEmpty()) {
+			this.addErrors(request, errors);
 			return true;
 		}
 		return false;
@@ -342,51 +354,53 @@
 	 * @param content
 	 * @param filesUploaded 
 	 */
-	private void setLearnerDTO(HttpServletRequest request, SessionMap sessionMap, SubmitUser currUser, List filesUploaded, ToolAccessMode mode) {
-		
+	private void setLearnerDTO(HttpServletRequest request, SessionMap sessionMap, SubmitUser currUser, List filesUploaded,
+			ToolAccessMode mode) {
+
 		SubmitUserDTO dto = new SubmitUserDTO(currUser);
-		if(currUser != null){
+		if (currUser != null) {
 			//if Monitoring does not release marks, then skip this mark and comment content.
-			if(filesUploaded != null){
+			if (filesUploaded != null) {
 				Iterator iter = filesUploaded.iterator();
-				while(iter.hasNext()){
+				while (iter.hasNext()) {
 					FileDetailsDTO filedto = (FileDetailsDTO) iter.next();
-					if(mode.isTeacher() ||  currUser.getUid().equals(filedto.getOwner().getUserUid()))
+					if (mode.isTeacher() || currUser.getUid().equals(filedto.getOwner().getUserUid())) {
 						filedto.setCurrentLearner(true);
-					else
+					}
+					else {
 						filedto.setCurrentLearner(false);
-					if(filedto .getDateMarksReleased() == null){
-						filedto .setComments(null);
-						filedto .setMarks(null);
 					}
+					if (filedto.getDateMarksReleased() == null) {
+						filedto.setComments(null);
+						filedto.setMarks(null);
+					}
 				}
 			}
 			dto.setFilesUploaded(filesUploaded);
 		}
-		
+
 		//preset
 		boolean limitUpload = (Boolean) sessionMap.get(SbmtConstants.ATTR_LIMIT_UPLOAD);
-		if(limitUpload &&  filesUploaded != null){
-			int limit = (Integer)sessionMap.get(SbmtConstants.ATTR_LIMIT_UPLOAD_NUMBER);
-			if(limit == filesUploaded.size()){
+		if (limitUpload && filesUploaded != null) {
+			int limit = (Integer) sessionMap.get(SbmtConstants.ATTR_LIMIT_UPLOAD_NUMBER);
+			if (limit == filesUploaded.size()) {
 				sessionMap.put(SbmtConstants.ATTR_ARRIVE_LIMIT, true);
 			}
-			int limitUploadLeft = limit -  filesUploaded.size();
+			int limitUploadLeft = limit - filesUploaded.size();
 			dto.setLimitUploadLeft(limitUploadLeft);
 		}
-		
+
 		// retreive notebook reflection entry.
 		ISubmitFilesService submitFilesService = getService();
-		
-		NotebookEntry notebookEntry = submitFilesService.getEntry((Long)sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID), 
-				CoreNotebookConstants.NOTEBOOK_TOOL, 
-				SbmtConstants.TOOL_SIGNATURE, currUser.getUserID());
-		
-		if ( notebookEntry != null) {
+
+		NotebookEntry notebookEntry = submitFilesService.getEntry((Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID),
+				CoreNotebookConstants.NOTEBOOK_TOOL, SbmtConstants.TOOL_SIGNATURE, currUser.getUserID());
+
+		if (notebookEntry != null) {
 			dto.setReflect(notebookEntry.getEntry());
 		}
-		
-		request.setAttribute("learner",dto);
+
+		request.setAttribute("learner", dto);
 	}
 
 	private SubmitUser getCurrentLearner(Long sessionID, ISubmitFilesService submitFilesService) {
@@ -396,11 +410,11 @@
 		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 		Integer userID = user.getUserID();
 
-		SubmitUser learner = submitFilesService.getSessionUser(sessionID,userID);
-		if(learner == null){
+		SubmitUser learner = submitFilesService.getSessionUser(sessionID, userID);
+		if (learner == null) {
 			learner = submitFilesService.createSessionUser(user, sessionID);
 		}
-			
+
 		return learner;
 	}
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
diff -u -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -21,33 +21,28 @@
  * ****************************************************************
  */
 
-/* $$Id$$ */	
+/* $$Id$$ */
 
 package org.lamsfoundation.lams.tool.sbmt.web;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.text.NumberFormat;
-import java.text.ParsePosition;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
 
 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.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.Region;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
@@ -61,14 +56,12 @@
 import org.lamsfoundation.lams.tool.sbmt.SubmitUser;
 import org.lamsfoundation.lams.tool.sbmt.dto.AuthoringDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
-import org.lamsfoundation.lams.tool.sbmt.dto.SubmitUserDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.SessionDTO;
 import org.lamsfoundation.lams.tool.sbmt.dto.StatisticDTO;
+import org.lamsfoundation.lams.tool.sbmt.dto.SubmitUserDTO;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
-import org.lamsfoundation.lams.tool.sbmt.util.SbmtWebUtils;
-import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.NumberUtil;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -77,7 +70,6 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-
 /**
  * @author Manpreet Minhas
  * @struts.action
@@ -98,78 +90,76 @@
  * @struts.action-forward name="viewReflect" path="/monitoring/notebook.jsp"
  */
 public class MonitoringAction extends LamsDispatchAction {
-	
+
 	public ISubmitFilesService submitFilesService;
-	
-    
-	private class SessionComparator implements Comparator<SessionDTO>{
+
+	private class SessionComparator implements Comparator<SessionDTO> {
 		public int compare(SessionDTO o1, SessionDTO o2) {
-			if(o1 != null && o2 != null){
+			if (o1 != null && o2 != null) {
 				return o1.getSessionName().compareTo(o2.getSessionName());
-			}else if(o1 != null)
+			}
+			else if (o1 != null) {
 				return 1;
-			else
+			}
+			else {
 				return -1;
+			}
 		}
 	}
-    /**
-     * Default ActionForward for Monitor
-     */
-    public ActionForward unspecified(
-            ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response)
-    {
-    	String contentFolderID = WebUtil.readStrParam(request,AttributeNames.PARAM_CONTENT_FOLDER_ID);
-    	Long contentID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
-    	submitFilesService = getSubmitFilesService();
-    	
-    	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
-    	
-//    	List userList = submitFilesService.getUsers(sessionID);
-        List submitFilesSessionList = submitFilesService.getSubmitFilesSessionByContentID(contentID);
-        summary(request, submitFilesSessionList);
+
+	/**
+	 * Default ActionForward for Monitor
+	 */
+	@Override
+	public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+		Long contentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+		submitFilesService = getSubmitFilesService();
+
+		request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
+
+		//    	List userList = submitFilesService.getUsers(sessionID);
+		List submitFilesSessionList = submitFilesService.getSubmitFilesSessionByContentID(contentID);
+		summary(request, submitFilesSessionList);
 		statistic(request, submitFilesSessionList);
-		
+
 		//instruction
 		SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(contentID);
 		//if this content does not exist, then reset the contentID to current value to keep it on HTML page.
-		persistContent.setContentID(contentID); 
-		
+		persistContent.setContentID(contentID);
+
 		AuthoringDTO authorDto = new AuthoringDTO(persistContent);
-		request.setAttribute(SbmtConstants.AUTHORING_DTO,authorDto);
+		request.setAttribute(SbmtConstants.AUTHORING_DTO, authorDto);
 		request.setAttribute(SbmtConstants.PAGE_EDITABLE, persistContent.isContentInUse());
-		
+
 		DynaActionForm smbtMonitoringForm = (DynaActionForm) form;
-//		smbtMonitoringForm.set("currentTab", WebUtil.readStrParam(request, AttributeNames.PARAM_CURRENT_TAB,true));
-		
+		//		smbtMonitoringForm.set("currentTab", WebUtil.readStrParam(request, AttributeNames.PARAM_CURRENT_TAB,true));
+
 		return mapping.findForward("success");
-    }
-    /**
-     * AJAX call to refresh statistic page.
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     */
-    public ActionForward doStatistic(
-            ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response)
-    {
-    	Long contentID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
-    	submitFilesService = getSubmitFilesService();
-    	
-//    	List userList = submitFilesService.getUsers(sessionID);
-        List submitFilesSessionList = submitFilesService.getSubmitFilesSessionByContentID(contentID);
+	}
+
+	/**
+	 * AJAX call to refresh statistic page.
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	public ActionForward doStatistic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		Long contentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+		submitFilesService = getSubmitFilesService();
+
+		//    	List userList = submitFilesService.getUsers(sessionID);
+		List submitFilesSessionList = submitFilesService.getSubmitFilesSessionByContentID(contentID);
 		statistic(request, submitFilesSessionList);
-		
+
 		return mapping.findForward("statistic");
-		
-    }
+
+	}
+
 	/**
 	 * Release mark
 	 * @param mapping
@@ -178,28 +168,29 @@
 	 * @param response
 	 * @return
 	 */
-	public ActionForward releaseMarks(ActionMapping mapping,
-			   ActionForm form,
-			   HttpServletRequest request,
-			   HttpServletResponse response){
+	public ActionForward releaseMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
 
 		//get service then update report table
 		submitFilesService = getSubmitFilesService();
-		Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
+		Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
 		submitFilesService.releaseMarksForSession(sessionID);
+
 		try {
 			PrintWriter out = response.getWriter();
 			SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
 			String sessionName = "";
-			if(session != null)
+			if (session != null) {
 				sessionName = session.getSessionName();
-			out.write(getMessageService().getMessage("msg.mark.released",new String[]{sessionName}));
+			}
+			out.write(getMessageService().getMessage("msg.mark.released", new String[] { sessionName }));
 			out.flush();
-		} catch (IOException e) {
 		}
-		
+		catch (IOException e) {
+		}
 		return null;
 	}
+
 	/**
 	 * Download submit file marks by MS Excel file format.
 	 * @param mapping
@@ -208,12 +199,10 @@
 	 * @param response
 	 * @return
 	 */
-	public ActionForward downloadMarks(ActionMapping mapping,
-			   ActionForm form,
-			   HttpServletRequest request,
-			   HttpServletResponse response){
-		
-		Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
+	public ActionForward downloadMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+
+		Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
 		submitFilesService = getSubmitFilesService();
 		//return FileDetailsDTO list according to the given sessionID
 		Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID, request.getLocale());
@@ -223,98 +212,101 @@
 			//create an empty excel file
 			HSSFWorkbook wb = new HSSFWorkbook();
 			HSSFSheet sheet = wb.createSheet("Marks");
-			sheet.setColumnWidth((short)0,(short)5000);
+			sheet.setColumnWidth((short) 0, (short) 5000);
 			HSSFRow row;
 			HSSFCell cell;
-			
+
 			Iterator iter = userFilesMap.values().iterator();
-			Iterator dtoIter; 
-			
+			Iterator dtoIter;
+
 			short idx = (short) 0;
-			
+
 			row = sheet.createRow(idx++);
 			cell = row.createCell((short) 2);
 			cell.setEncoding(HSSFCell.ENCODING_UTF_16);
 			cell.setCellValue(getMessageService().getMessage("label.learner.fileName"));
-			
+
 			cell = row.createCell((short) 3);
 			cell.setEncoding(HSSFCell.ENCODING_UTF_16);
 			cell.setCellValue(getMessageService().getMessage("label.learner.fileDescription"));
-			
+
 			cell = row.createCell((short) 4);
 			cell.setEncoding(HSSFCell.ENCODING_UTF_16);
 			cell.setCellValue(getMessageService().getMessage("label.learner.marks"));
-			
+
 			cell = row.createCell((short) 5);
 			cell.setEncoding(HSSFCell.ENCODING_UTF_16);
 			cell.setCellValue(getMessageService().getMessage("label.learner.comments"));
-			
-			while(iter.hasNext()){
+
+			while (iter.hasNext()) {
 				List list = (List) iter.next();
 				dtoIter = list.iterator();
-				
-				while(dtoIter.hasNext()){
+
+				while (dtoIter.hasNext()) {
 					FileDetailsDTO dto = (FileDetailsDTO) dtoIter.next();
 					row = sheet.createRow(idx++);
-					
+
 					short count = 0;
-					
-					cell = row.createCell((short) count++);
+
+					cell = row.createCell(count++);
 					cell.setEncoding(HSSFCell.ENCODING_UTF_16);
-					cell.setCellValue(dto.getOwner().getFirstName()+" "+dto.getOwner().getLastName());
-					
+					cell.setCellValue(dto.getOwner().getFirstName() + " " + dto.getOwner().getLastName());
+
 					++count;
-					
-					sheet.setColumnWidth((short) count,(short)8000);
-					
-					cell = row.createCell((short) count++);
+
+					sheet.setColumnWidth(count, (short) 8000);
+
+					cell = row.createCell(count++);
 					cell.setEncoding(HSSFCell.ENCODING_UTF_16);
 					cell.setCellValue(dto.getFilePath());
-					
-					cell = row.createCell((short) count++);
+
+					cell = row.createCell(count++);
 					cell.setEncoding(HSSFCell.ENCODING_UTF_16);
 					cell.setCellValue(dto.getFileDescription());
-					
-					cell = row.createCell((short) count++);
 
+					cell = row.createCell(count++);
+
 					String marks = dto.getMarks();
-					cell.setCellValue(marks!=null?marks:"");
+					cell.setCellValue(marks != null ? marks : "");
 
-					cell = row.createCell((short) count++);
+					cell = row.createCell(count++);
 					cell.setEncoding(HSSFCell.ENCODING_UTF_16);
 					cell.setCellValue(dto.getComments());
 				}
 			}
-			
+
 			ByteArrayOutputStream bos = new ByteArrayOutputStream();
 			wb.write(bos);
-			
+
 			//construct download file response header
-			String fileName = "marks" + sessionID+".xls";
+			String fileName = "marks" + sessionID + ".xls";
 			String mineType = "application/vnd.ms-excel";
 			String header = "attachment; filename=\"" + fileName + "\";";
 			response.setContentType(mineType);
-			response.setHeader("Content-Disposition",header);
+			response.setHeader("Content-Disposition", header);
 
 			byte[] data = bos.toByteArray();
-			response.getOutputStream().write(data,0,data.length);
+			response.getOutputStream().write(data, 0, data.length);
 			response.getOutputStream().flush();
-		} catch (Exception e) {
-			log.error(e);
-			errors =new ActionMessage("monitoring.download.error",e.toString()).toString();
 		}
+		catch (Exception e) {
+			LamsDispatchAction.log.error(e);
+			errors = new ActionMessage("monitoring.download.error", e.toString()).toString();
+		}
 
-		if(errors != null){
+		if (errors != null) {
 			try {
 				PrintWriter out = response.getWriter();
 				out.write(errors);
 				out.flush();
-			} catch (IOException e) {
 			}
+			catch (IOException e) {
+			}
 		}
-			
+
 		return null;
 	}
+
 	//**********************************************************
 	// Mark udpate/view methods
 	//**********************************************************
@@ -326,21 +318,19 @@
 	 * @param response
 	 * @return
 	 */
-	public ActionForward listMark(ActionMapping mapping,
-							   ActionForm form,
-							   HttpServletRequest request,
-							   HttpServletResponse response){
-		Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
-		Integer userID = WebUtil.readIntParam(request,"userID");
+	public ActionForward listMark(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
+		Integer userID = WebUtil.readIntParam(request, "userID");
 
 		submitFilesService = getSubmitFilesService();
 		//return FileDetailsDTO list according to the given userID and sessionID
-		List files = submitFilesService.getFilesUploadedByUser(userID,sessionID,request.getLocale());
-		
-		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
-		request.setAttribute("report",files);
+		List files = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale());
+
+		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
+		request.setAttribute("report", files);
 		return mapping.findForward("listMark");
 	}
+
 	/**
 	 * Display update mark initial page.
 	 * @param mapping
@@ -349,29 +339,24 @@
 	 * @param response
 	 * @return
 	 */
-	public ActionForward newMark(ActionMapping mapping,
-			  ActionForm form,
-			  HttpServletRequest request,
-			  HttpServletResponse response){
-		
-		Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
-		Long detailID = new Long(WebUtil.readLongParam(request,"detailID"));
+	public ActionForward newMark(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+
+		Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
+		Long detailID = new Long(WebUtil.readLongParam(request, "detailID"));
 		String updateMode = request.getParameter("updateMode");
-		
+
 		submitFilesService = getSubmitFilesService();
-		
+
 		List report = new ArrayList<FileDetailsDTO>();
-		report.add(submitFilesService.getFileDetails(detailID,request.getLocale()));
-		
-		request.setAttribute("report",report);
+		report.add(submitFilesService.getFileDetails(detailID, request.getLocale()));
+
+		request.setAttribute("report", report);
 		request.setAttribute("updateMode", updateMode);
-		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
-		
+		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
+
 		return mapping.findForward("updateMark");
 	}
 
-
-
 	/**
 	 * Update mark.
 	 * @param mapping
@@ -380,61 +365,61 @@
 	 * @param response
 	 * @return
 	 */
-	public ActionForward updateMark(ActionMapping mapping,
-							   ActionForm form,
-							   HttpServletRequest request,
-							   HttpServletResponse response){
-		Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
-		Integer userID = WebUtil.readIntParam(request,"userID");
-		Long detailID = new Long(WebUtil.readLongParam(request,"detailID"));
+	public ActionForward updateMark(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
+		Integer userID = WebUtil.readIntParam(request, "userID");
+		Long detailID = new Long(WebUtil.readLongParam(request, "detailID"));
 		String updateMode = request.getParameter("updateMode");
-		Long reportID= new Long(WebUtil.readLongParam(request,"reportID"));
-		
-		ActionMessages errors = new ActionMessages();  
+		Long reportID = new Long(WebUtil.readLongParam(request, "reportID"));
+
+		ActionMessages errors = new ActionMessages();
 		// Check whether the mark is valid. 
 		Float marks = null;
 		String markStr = request.getParameter("marks");
 		try {
 			marks = NumberUtil.getLocalisedFloat(markStr, request.getLocale());
-		} catch (Exception e) {
-			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.mark.invalid.number"));
 		}
-		
-		String comments = WebUtil.readStrParam(request,"comments",true);
-		if(!errors.isEmpty()){
+		catch (Exception e) {
+			errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("errors.mark.invalid.number"));
+		}
+
+		String comments = WebUtil.readStrParam(request, "comments", true);
+		if (!errors.isEmpty()) {
 			submitFilesService = getSubmitFilesService();
 			List report = new ArrayList<FileDetailsDTO>();
-			FileDetailsDTO fileDetail = submitFilesService.getFileDetails(detailID,request.getLocale());
+			FileDetailsDTO fileDetail = submitFilesService.getFileDetails(detailID, request.getLocale());
 			//echo back the input, even they are wrong.
 			fileDetail.setComments(comments);
 			fileDetail.setMarks(markStr);
 			report.add(fileDetail);
-			
-			request.setAttribute("report",report);
+
+			request.setAttribute("report", report);
 			request.setAttribute("updateMode", updateMode);
-			request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
-			
-			
-			saveErrors(request,errors);
+			request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
+
+			saveErrors(request, errors);
 			return mapping.findForward("updateMark");
 		}
-		
+
 		//get service then update report table
 		submitFilesService = getSubmitFilesService();
-		
-		submitFilesService.updateMarks(reportID,marks,comments);
-		
-		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
-		if(StringUtils.equals(updateMode, "listMark")){
-			List report = submitFilesService.getFilesUploadedByUser(userID,sessionID,request.getLocale());
-			request.setAttribute("report",report);
+
+		submitFilesService.updateMarks(reportID, marks, comments);
+
+		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
+		if (StringUtils.equals(updateMode, "listMark")) {
+			List report = submitFilesService.getFilesUploadedByUser(userID, sessionID, request.getLocale());
+			request.setAttribute("report", report);
 			return mapping.findForward("listMark");
-		}else{
-			Map report = submitFilesService.getFilesUploadedBySession(sessionID,request.getLocale());
-			request.setAttribute("reports",report);
+		}
+		else {
+			Map report = submitFilesService.getFilesUploadedBySession(sessionID, request.getLocale());
+			request.setAttribute("reports", report);
 			return mapping.findForward("listAllMarks");
 		}
 	}
+
 	/**
 	 * View mark of all learner from same tool content ID. 
 	 * @param mapping
@@ -443,39 +428,37 @@
 	 * @param response
 	 * @return
 	 */
-	public ActionForward listAllMarks(ActionMapping mapping,
-			   ActionForm form,
-			   HttpServletRequest request,
-			   HttpServletResponse response){
-		
-		Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
+	public ActionForward listAllMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+
+		Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
 		submitFilesService = getSubmitFilesService();
 		//return FileDetailsDTO list according to the given sessionID
-		Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID,request.getLocale());
-		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
-//		request.setAttribute("user",submitFilesService.getUserDetails(userID));
-		request.setAttribute("reports",userFilesMap);
-		
+		Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID, request.getLocale());
+		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
+		//		request.setAttribute("user",submitFilesService.getUserDetails(userID));
+		request.setAttribute("reports", userFilesMap);
+
 		return mapping.findForward("listAllMarks");
 
-	}	
+	}
+
 	//**********************************************************
 	// Private methods
 	//**********************************************************
-	
-	private ISubmitFilesService getSubmitFilesService(){
-		return SubmitFilesServiceProxy
-			   .getSubmitFilesService(this.getServlet()
-			   .getServletContext());
+
+	private ISubmitFilesService getSubmitFilesService() {
+		return SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
 	}
-	
+
 	/**
 	 * Return ResourceService bean.
 	 */
 	private MessageService getMessageService() {
-	      WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-	      return (MessageService) wac.getBean("sbmtMessageService");
+		WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
+		return (MessageService) wac.getBean("sbmtMessageService");
 	}
+
 	/**
 	 * Save file mark information into HttpRequest
 	 * @param request
@@ -487,6 +470,7 @@
 	private void setMarkPage(HttpServletRequest request, Long sessionID, Long userID, Long detailID, String updateMode) {
 
 	}
+
 	/**
 	 * Save statistic information into request
 	 * @param request
@@ -499,113 +483,117 @@
 		// build a map with all users in the submitFilesSessionList
 		it = submitFilesSessionList.iterator();
 		while (it.hasNext()) {
-			
+
 			SubmitFilesSession sfs = (SubmitFilesSession) it.next();
 			Long sessionID = sfs.getSessionID();
 			String sessionName = sfs.getSessionName();
-				
+
 			//return FileDetailsDTO list according to the given sessionID
-			Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID,request.getLocale());
+			Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID, request.getLocale());
 			Iterator iter = userFilesMap.values().iterator();
-			Iterator dtoIter; 
+			Iterator dtoIter;
 			int notMarkedCount = 0;
 			int markedCount = 0;
-			while(iter.hasNext()){
+			while (iter.hasNext()) {
 				List list = (List) iter.next();
 				dtoIter = list.iterator();
-				while(dtoIter.hasNext()){
+				while (dtoIter.hasNext()) {
 					FileDetailsDTO dto = (FileDetailsDTO) dtoIter.next();
-					if(dto.getMarks() == null)
+					if (dto.getMarks() == null) {
 						notMarkedCount++;
-					else
+					}
+					else {
 						markedCount++;
+					}
 				}
 			}
 			StatisticDTO statisticDto = new StatisticDTO();
 			SessionDTO sessionDto = new SessionDTO();
 			statisticDto.setMarkedCount(markedCount);
 			statisticDto.setNotMarkedCount(notMarkedCount);
-			statisticDto.setTotalUploadedFiles(markedCount+notMarkedCount);
+			statisticDto.setTotalUploadedFiles(markedCount + notMarkedCount);
 			sessionDto.setSessionID(sessionID);
 			sessionDto.setSessionName(sessionName);
-			sessionStatisticMap.put(sessionDto,statisticDto);
+			sessionStatisticMap.put(sessionDto, statisticDto);
 		}
 
-		request.setAttribute("statisticList",sessionStatisticMap);
+		request.setAttribute("statisticList", sessionStatisticMap);
 	}
+
 	/**
 	 * Save Summary information into HttpRequest.
 	 * @param request
 	 * @param submitFilesSessionList
 	 */
 	private void summary(HttpServletRequest request, List submitFilesSessionList) {
 		Map<SessionDTO, List> sessionUserMap = new TreeMap<SessionDTO, List>(this.new SessionComparator());
-        
-        //build a map with all users in the submitFilesSessionList
-        Iterator it = submitFilesSessionList.iterator();
-        while(it.hasNext()){
-        	SessionDTO sessionDto = new SessionDTO();
-        	SubmitFilesSession sfs = (SubmitFilesSession)it.next();
-        	
-            Long sessionID = sfs.getSessionID();
-            sessionDto.setSessionID(sessionID);
-            sessionDto.setSessionName(sfs.getSessionName());
-            
-            boolean hasReflect = sfs.getContent().isReflectOnActivity();
-            Map<SubmitUser,FileDetailsDTO> userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID,request.getLocale());
-            
-            //construct LearnerDTO list
-            List<SubmitUser> userList = submitFilesService.getUsersBySession(sessionID);
-            List<SubmitUserDTO> learnerList = new ArrayList<SubmitUserDTO>();
-            for(SubmitUser user : userList){
-            	SubmitUserDTO learnerDto = new SubmitUserDTO(user);
-            	learnerDto.setHasRefection(hasReflect);
-            	
+
+		//build a map with all users in the submitFilesSessionList
+		Iterator it = submitFilesSessionList.iterator();
+		while (it.hasNext()) {
+			SessionDTO sessionDto = new SessionDTO();
+			SubmitFilesSession sfs = (SubmitFilesSession) it.next();
+
+			Long sessionID = sfs.getSessionID();
+			sessionDto.setSessionID(sessionID);
+			sessionDto.setSessionName(sfs.getSessionName());
+
+			boolean hasReflect = sfs.getContent().isReflectOnActivity();
+			Map<SubmitUser, FileDetailsDTO> userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID, request
+					.getLocale());
+
+			//construct LearnerDTO list
+			List<SubmitUser> userList = submitFilesService.getUsersBySession(sessionID);
+			List<SubmitUserDTO> learnerList = new ArrayList<SubmitUserDTO>();
+			for (SubmitUser user : userList) {
+				SubmitUserDTO learnerDto = new SubmitUserDTO(user);
+				learnerDto.setHasRefection(hasReflect);
+
 				learnerDto.setAnyFilesMarked(false);
 				List<FileDetailsDTO> files = (List<FileDetailsDTO>) userFilesMap.get(user);
-				if ( files != null && files.size() > 0 ) {
-					for ( FileDetailsDTO file : files ) {
-						if ( file.getMarks() != null && file.getMarks().trim().length() > 0) {
+				if (files != null && files.size() > 0) {
+					for (FileDetailsDTO file : files) {
+						if (file.getMarks() != null && file.getMarks().trim().length() > 0) {
 							learnerDto.setAnyFilesMarked(true);
 							break;
 						}
 					}
 				}
-            	
-            	learnerList.add(learnerDto);
-            }
-            sessionUserMap.put(sessionDto, learnerList);
-        }
-        
+
+				learnerList.add(learnerDto);
+			}
+			sessionUserMap.put(sessionDto, learnerList);
+		}
+
 		//request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID);
-		request.setAttribute("sessionUserMap",sessionUserMap);
+		request.setAttribute("sessionUserMap", sessionUserMap);
 	}
-	
+
 	public ActionForward viewReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
-		Long userUid = WebUtil.readLongParam(request,SbmtConstants.ATTR_USER_UID);
+		Long userUid = WebUtil.readLongParam(request, SbmtConstants.ATTR_USER_UID);
 		Long sessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
-		
+
 		submitFilesService = getSubmitFilesService();
 		SubmitUser userDto = submitFilesService.getUserByUid(userUid);
 
 		submitFilesService = getSubmitFilesService();
-		NotebookEntry notebookEntry = submitFilesService.getEntry(sessionID, 
-				CoreNotebookConstants.NOTEBOOK_TOOL, 
+		NotebookEntry notebookEntry = submitFilesService.getEntry(sessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
 				SbmtConstants.TOOL_SIGNATURE, userDto.getUserID());
-		
+
 		SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
-		
+
 		SubmitUserDTO userDTO = new SubmitUserDTO(userDto);
-		if(notebookEntry == null){
+		if (notebookEntry == null) {
 			userDTO.setFinishReflection(false);
 			userDTO.setReflect(null);
-		}else{
+		}
+		else {
 			userDTO.setFinishReflection(true);
 			userDTO.setReflect(notebookEntry.getEntry());
 		}
 		userDTO.setReflectInstrctions(session.getContent().getReflectInstructions());
-		
+
 		request.setAttribute("userDTO", userDTO);
 		return mapping.findForward("viewReflect");
 	}
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r6ab1be78f747daf9e82788ceee85ccce03d0ab9d -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 6ab1be78f747daf9e82788ceee85ccce03d0ab9d)
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -61,32 +61,6 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/learner"
-      type="org.lamsfoundation.lams.tool.sbmt.web.LearnerAction"
-      name="learnerForm"
-      scope="request"
-      input="/learner/sbmtlearner.jsp"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="success"
-        path="/learner/sbmtlearner.jsp"
-        redirect="false"
-      />
-      <forward
-        name="defineLater"
-        path="/learner/definelater.jsp"
-        redirect="false"
-      />
-      <forward
-        name="runOffline"
-        path="/learner/runoffline.jsp"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/monitoring"
       type="org.lamsfoundation.lams.tool.sbmt.web.MonitoringAction"
       name="SbmtMonitoringForm"
@@ -147,6 +121,32 @@
         redirect="false"
       />
     </action>
+    <action
+      path="/learner"
+      type="org.lamsfoundation.lams.tool.sbmt.web.LearnerAction"
+      name="learnerForm"
+      scope="request"
+      input="/learner/sbmtlearner.jsp"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="success"
+        path="/learner/sbmtlearner.jsp"
+        redirect="false"
+      />
+      <forward
+        name="defineLater"
+        path="/learner/definelater.jsp"
+        redirect="false"
+      />
+      <forward
+        name="runOffline"
+        path="/learner/runoffline.jsp"
+        redirect="false"
+      />
+    </action>
 
    <!-- ========== Action Mapping Definitions ============================== -->
 		<action path="/definelater" type="org.lamsfoundation.lams.tool.sbmt.web.AuthoringAction" 
Index: lams_tool_sbmt/web/authoring/advance.jsp
===================================================================
diff -u -r1977f2d6d4038839d28238041d7e5cd4dfd35036 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision 1977f2d6d4038839d28238041d7e5cd4dfd35036)
+++ lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -28,6 +28,15 @@
 </p>
 
 <p>
+	<html:checkbox property="notifyLearnersOnMarkRelease" styleId="notifyLearnersOnMarkRelease"
+		styleClass="noBorder">
+	</html:checkbox>
+	<label for="notifyLearnersOnMarkRelease">
+		<fmt:message key="label.authoring.advanced.notify.mark.release" />
+	</label>
+</p>
+
+<p>
 	<html:checkbox property="reflectOnActivity" styleClass="noBorder"
 		styleId="reflectOn">
 	</html:checkbox>
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
diff -u -rb011786cc660c7861944698562681008be671915 -ra01292ae06e058ffcc16aaeec6d61959a7b69273
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision b011786cc660c7861944698562681008be671915)
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision a01292ae06e058ffcc16aaeec6d61959a7b69273)
@@ -122,6 +122,22 @@
 	
 	<tr>
 		<td>
+			<fmt:message key="label.authoring.advanced.notify.mark.release" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${authoring.notifyLearnersOnMarkRelease}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	<tr>
+		<td>
 			<fmt:message key="monitor.summary.td.addNotebook" />
 		</td>