Index: lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatMessage.hbm.xml
===================================================================
diff -u -reb77a0a10c2be753711e4653b8ff2362c3ba154a -r9029103eae5d664ff5ccc7a9dcffe060f74de24f
--- lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatMessage.hbm.xml	(.../ChatMessage.hbm.xml)	(revision eb77a0a10c2be753711e4653b8ff2362c3ba154a)
+++ lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatMessage.hbm.xml	(.../ChatMessage.hbm.xml)	(revision 9029103eae5d664ff5ccc7a9dcffe060f74de24f)
@@ -45,7 +45,7 @@
             insert="true"
         >
             <column
-                name="from_user_id" 
+                name="from_user_uid" 
             />
         </many-to-one>
 
@@ -58,7 +58,7 @@
             insert="true"
         >
             <column
-                name="to_user_id" 
+                name="to_user_uid" 
             />
         </many-to-one>
 
@@ -73,11 +73,10 @@
 
         <property
             name="body"
-            type="java.lang.String"
+            type="text"
             update="true"
             insert="true"
             column="body"
-            length="255"
         />
 
         <property
Index: lams_tool_chat/conf/xdoclet/error-pages.xml
===================================================================
diff -u
--- lams_tool_chat/conf/xdoclet/error-pages.xml	(revision 0)
+++ lams_tool_chat/conf/xdoclet/error-pages.xml	(revision 9029103eae5d664ff5ccc7a9dcffe060f74de24f)
@@ -0,0 +1,13 @@
+    <error-page>
+        <error-code>500</error-code>
+        <location>/error.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>403</error-code>
+        <location>/403.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>404</error-code>
+        <location>/404.jsp</location>
+    </error-page>
+    
\ No newline at end of file
Index: lams_tool_chat/conf/xdoclet/global-exceptions.xml
===================================================================
diff -u
--- lams_tool_chat/conf/xdoclet/global-exceptions.xml	(revision 0)
+++ lams_tool_chat/conf/xdoclet/global-exceptions.xml	(revision 9029103eae5d664ff5ccc7a9dcffe060f74de24f)
@@ -0,0 +1,8 @@
+<global-exceptions>
+  <exception
+    handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
+    key="error.system"
+    path="/error.jsp"
+    scope="request"
+    type="java.lang.Exception"/>
+</global-exceptions>
\ No newline at end of file
Index: lams_tool_chat/web/403.jsp
===================================================================
diff -u
--- lams_tool_chat/web/403.jsp	(revision 0)
+++ lams_tool_chat/web/403.jsp	(revision 9029103eae5d664ff5ccc7a9dcffe060f74de24f)
@@ -0,0 +1,6 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-core" prefix="c" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<c:redirect url="${lams}errorpages/403.jsp"/>
\ No newline at end of file
Index: lams_tool_chat/web/404.jsp
===================================================================
diff -u
--- lams_tool_chat/web/404.jsp	(revision 0)
+++ lams_tool_chat/web/404.jsp	(revision 9029103eae5d664ff5ccc7a9dcffe060f74de24f)
@@ -0,0 +1,8 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-core" prefix="c" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<c:redirect url="${lams}errorpages/404.jsp"/>
+
+
Index: lams_tool_chat/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r9393c098e5dfd603e2d37347cd1e531a25aa424a -r9029103eae5d664ff5ccc7a9dcffe060f74de24f
--- lams_tool_chat/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 9393c098e5dfd603e2d37347cd1e531a25aa424a)
+++ lams_tool_chat/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 9029103eae5d664ff5ccc7a9dcffe060f74de24f)
@@ -29,10 +29,14 @@
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
-  <!--
-    Define your exceptions in a file called global-exceptions.xml and place
-    it in your merge directory.
-  -->
+  <global-exceptions>
+  <exception
+    handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
+    key="error.system"
+    path="/error.jsp"
+    scope="request"
+    type="java.lang.Exception"/>
+</global-exceptions>
 
   <!-- ========== Global Forward Definitions =================================== -->
   <global-forwards>
Index: lams_tool_chat/web/WEB-INF/web.xml
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -r9029103eae5d664ff5ccc7a9dcffe060f74de24f
--- lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision 9029103eae5d664ff5ccc7a9dcffe060f74de24f)
@@ -167,13 +167,19 @@
    <!ELEMENT mime-mapping (extension, mime-type)>
    -->
 
-   <!--
-   To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
-   Organize error-pages.xml following this DTD slice:
+      <error-page>
+        <error-code>500</error-code>
+        <location>/error.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>403</error-code>
+        <location>/403.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>404</error-code>
+        <location>/404.jsp</location>
+    </error-page>
 
-   <!ELEMENT error-page ((error-code | exception-type), location)>
-   -->
-
   	<jsp-config>
 
 		<!--  ======================================================== -->	
Index: lams_tool_chat/web/error.jsp
===================================================================
diff -u
--- lams_tool_chat/web/error.jsp	(revision 0)
+++ lams_tool_chat/web/error.jsp	(revision 9029103eae5d664ff5ccc7a9dcffe060f74de24f)
@@ -0,0 +1,63 @@
+<%@ page language="java" isErrorPage="true" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<%-- Catch JSP Servlet Exception --%>
+<%
+if (exception != null) {
+%>
+<c:set var="errorMessage">
+	<%=exception.getMessage()%>
+</c:set>
+<c:set var="errorName">
+	<%=exception.getClass().getName()%>
+</c:set>
+<%
+		java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream();
+		java.io.PrintStream os = new java.io.PrintStream(bos);
+		exception.printStackTrace(os);
+		String stack = new String(bos.toByteArray());
+%>
+<c:set var="errorStack">
+	<%=stack%>
+</c:set>
+<%
+} else if ((Exception) request.getAttribute("javax.servlet.error.exception") != null) {
+%>
+
+<c:set var="errorMessage">
+	<%=((Exception) request.getAttribute("javax.servlet.error.exception")).getMessage()%>
+</c:set>
+<c:set var="errorName">
+	<%=((Exception) request.getAttribute("javax.servlet.error.exception")).getMessage()
+									.getClass().getName()%>
+</c:set>
+<%
+		java.io.ByteArrayOutputStream bos = new java.io.ByteArrayOutputStream();
+		java.io.PrintStream os = new java.io.PrintStream(bos);
+		((Exception) request.getAttribute("javax.servlet.error.exception")).printStackTrace(os);
+		String stack = new String(bos.toByteArray());
+%>
+<c:set var="errorStack">
+	<%=stack%>
+</c:set>
+<%
+}
+%>
+<form action="${lams}errorpages/error.jsp" method="post" id="errorForm">
+	<input type="hidden" name="errorName" value="${errorName}"/>
+	<input type="hidden" name="errorMessage" value="${errorMessage}"/>
+	<input type="hidden" name="errorStack" value="${errorStack}"/>
+</form>
+
+<script type="text/javascript">
+
+if(window.top != null)
+	document.getElementById("errorForm").target = "_parent";
+document.getElementById("errorForm").submit();
+
+</script>
\ No newline at end of file
Index: lams_tool_chat/web/login.jsp
===================================================================
diff -u
--- lams_tool_chat/web/login.jsp	(revision 0)
+++ lams_tool_chat/web/login.jsp	(revision 9029103eae5d664ff5ccc7a9dcffe060f74de24f)
@@ -0,0 +1,12 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-core" prefix="c" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<script type="text/javascript">
+	if(window.top != null){
+		window.top.location.href = "${lams}index.jsp";
+	}else
+		location.href = "${lams}index.jsp";
+</script>
+
+