Index: lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/Chat.hbm.xml
===================================================================
diff -u -rb32ded72d955763a9b49e33e2dc2ab195d83564b -reb77a0a10c2be753711e4653b8ff2362c3ba154a
--- lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/Chat.hbm.xml	(.../Chat.hbm.xml)	(revision b32ded72d955763a9b49e33e2dc2ab195d83564b)
+++ lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/Chat.hbm.xml	(.../Chat.hbm.xml)	(revision eb77a0a10c2be753711e4653b8ff2362c3ba154a)
@@ -169,6 +169,24 @@
 
         </set>
 
+        <property
+            name="filteringEnabled"
+            type="java.lang.Boolean"
+            update="true"
+            insert="true"
+            column="filtering_enabled"
+            length="1"
+        />
+
+        <property
+            name="filterKeywords"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="filter_keywords"
+            length="65535"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Chat.xml
Index: lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatMessage.hbm.xml
===================================================================
diff -u -r156ce67fae101541398bc21b3ecbfabcc410086c -reb77a0a10c2be753711e4653b8ff2362c3ba154a
--- lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatMessage.hbm.xml	(.../ChatMessage.hbm.xml)	(revision 156ce67fae101541398bc21b3ecbfabcc410086c)
+++ lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatMessage.hbm.xml	(.../ChatMessage.hbm.xml)	(revision eb77a0a10c2be753711e4653b8ff2362c3ba154a)
@@ -26,6 +26,17 @@
         </id>
 
         <many-to-one
+            name="chatSession"
+            class="org.lamsfoundation.lams.tool.chat.model.ChatSession"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="chat_session_uid"
+            not-null="true"
+        />
+
+        <many-to-one
             name="fromUser"
             class="org.lamsfoundation.lams.tool.chat.model.ChatUser"
             cascade="none"
@@ -69,6 +80,22 @@
             length="255"
         />
 
+        <property
+            name="sendDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="send_date"
+        />
+
+        <property
+            name="hidden"
+            type="java.lang.Boolean"
+            update="true"
+            insert="true"
+            column="hidden"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ChatMessage.xml
Index: lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatSession.hbm.xml
===================================================================
diff -u -rbbb7be61818ecfad3b0287dd3161ab98fa3b3ebb -reb77a0a10c2be753711e4653b8ff2362c3ba154a
--- lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatSession.hbm.xml	(.../ChatSession.hbm.xml)	(revision bbb7be61818ecfad3b0287dd3161ab98fa3b3ebb)
+++ lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatSession.hbm.xml	(.../ChatSession.hbm.xml)	(revision eb77a0a10c2be753711e4653b8ff2362c3ba154a)
@@ -90,7 +90,7 @@
         >
 
             <key
-                column="session_id"
+                column="chat_session_uid"
             >
             </key>
 
@@ -109,6 +109,25 @@
             length="250"
         />
 
+        <set
+            name="chatMessages"
+            lazy="true"
+            inverse="true"
+            cascade="none"
+            sort="unsorted"
+        >
+
+            <key
+                column="chat_session_uid"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.chat.model.ChatMessage"
+            />
+
+        </set>
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ChatSession.xml
Index: lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatUser.hbm.xml
===================================================================
diff -u -rbbb7be61818ecfad3b0287dd3161ab98fa3b3ebb -reb77a0a10c2be753711e4653b8ff2362c3ba154a
--- lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatUser.hbm.xml	(.../ChatUser.hbm.xml)	(revision bbb7be61818ecfad3b0287dd3161ab98fa3b3ebb)
+++ lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatUser.hbm.xml	(.../ChatUser.hbm.xml)	(revision eb77a0a10c2be753711e4653b8ff2362c3ba154a)
@@ -79,7 +79,7 @@
             insert="true"
         >
             <column
-                name="session_id" 
+                name="chat_session_uid" 
             />
         </many-to-one>
 
Fisheye: Tag eb77a0a10c2be753711e4653b8ff2362c3ba154a refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/lams.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_chat/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -re1582051fac0c62608ec525ed2de8b666699ac86 -reb77a0a10c2be753711e4653b8ff2362c3ba154a
--- lams_tool_chat/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
+++ lams_tool_chat/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision eb77a0a10c2be753711e4653b8ff2362c3ba154a)
@@ -13,7 +13,14 @@
   <!-- ========== Form Bean Definitions =================================== -->
   <form-beans>
 
-   <form-bean name="authoringForm" type="org.lamsfoundation.lams.tool.chat.web.forms.AuthoringForm" />
+    <form-bean
+      name="monitoringForm"
+      type="org.lamsfoundation.lams.tool.chat.web.forms.MonitoringForm"
+    />
+    <form-bean
+      name="authoringForm"
+      type="org.lamsfoundation.lams.tool.chat.web.forms.AuthoringForm"
+    />
 
   </form-beans>
 
@@ -45,14 +52,27 @@
     <action
       path="/monitoring"
       type="org.lamsfoundation.lams.tool.chat.web.actions.MonitoringAction"
+      name="monitoringForm"
+      scope="request"
+      parameter="dispatch"
       unknown="false"
-      validate="true"
+      validate="false"
     >
       <forward
         name="success"
         path="tiles:/monitoring/main"
         redirect="false"
       />
+      <forward
+        name="chat_client"
+        path="tiles:/monitoring/chat_client"
+        redirect="false"
+      />
+      <forward
+        name="chat_history"
+        path="tiles:/monitoring/chat_history"
+        redirect="false"
+      />
     </action>
     <action
       path="/clearsession"
Index: lams_tool_chat/web/WEB-INF/web.xml
===================================================================
diff -u -reb34584421f5dd5cb2a537c66826cd4da3e52cc8 -reb77a0a10c2be753711e4653b8ff2362c3ba154a
--- lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision eb34584421f5dd5cb2a537c66826cd4da3e52cc8)
+++ lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision eb77a0a10c2be753711e4653b8ff2362c3ba154a)
@@ -33,7 +33,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>coreSessionFactory</param-value>
+		<param-value>chatSessionFactory</param-value>
 	</init-param>
    </filter>
 	<filter>
@@ -269,6 +269,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>STAFF</role-name>
+    		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -281,6 +282,7 @@
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
     		<role-name>STAFF</role-name>
+    		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>