Index: lams_tool_forum/conf/xdoclet/web-security.xml
===================================================================
diff -u
--- lams_tool_forum/conf/xdoclet/web-security.xml	(revision 0)
+++ lams_tool_forum/conf/xdoclet/web-security.xml	(revision 6bb2802253132bb7da7aa0e9dba50f94dd617f3a)
@@ -0,0 +1,91 @@
+	<!--  Security Constraint -->
+	<security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Secure Content</web-resource-name>
+			<url-pattern>/*</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>LEARNER</role-name>
+    		<role-name>TEACHER</role-name>
+    		<role-name>STAFF</role-name>
+    		<role-name>AUTHOR</role-name>
+    		<role-name>ADMIN</role-name>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
+
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Authoring Update</web-resource-name>
+		    <url-pattern>/authoring.do</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>AUTHOR</role-name>
+    	</auth-constraint>
+    </security-constraint>
+    
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Staff Content</web-resource-name>
+		    <url-pattern>/monitoring.do</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>STAFF</role-name>
+    		<role-name>TEACHER</role-name>
+    	</auth-constraint>
+    </security-constraint>
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Staff Content</web-resource-name>
+		    <url-pattern>/definelater.do</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>STAFF</role-name>
+    		<role-name>TEACHER</role-name>
+    	</auth-constraint>
+    </security-constraint>
+
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Adminstrator Content</web-resource-name>
+		    <url-pattern>/admin.do</url-pattern> 
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>ADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
+    
+    
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>LAMS System Adminstrator Content</web-resource-name>
+		    <url-pattern>/sysadmin.do</url-pattern> 
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
+    
+	<!--  some combine role security setting -->
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Download Files</web-resource-name>
+		    <url-pattern>/download/</url-pattern>
+    	</web-resource-collection>
+    	<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>
+    </security-constraint>
+
+	<!--  Login Configuration -->
+  	<login-config>
+   		<auth-method>FORM</auth-method>
+		<realm-name>LAMS</realm-name>
+   		<form-login-config>
+    		<form-login-page>/login.jsp</form-login-page>
+   		</form-login-config>
+   	</login-config>
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r9719695d2ad2c0dbe06c93d032eef994f634b9d5 -r6bb2802253132bb7da7aa0e9dba50f94dd617f3a
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 9719695d2ad2c0dbe06c93d032eef994f634b9d5)
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 6bb2802253132bb7da7aa0e9dba50f94dd617f3a)
@@ -100,7 +100,7 @@
 	</definition>
 	<definition name="tiles:/monitoring/forum/defineLater" extends="tiles:tab:layout">
     	<put name="pageTitleKey" value="page.title.monitoring.definelater"/>
-    	<put name="header" value="/jsps/authoring/header.jsp"/>
+    	<put name="header" value="/jsps/authoring/definelaterheader.jsp"/>
     	<put name="body" value="/jsps/authoring/definelater.jsp"/>
 	</definition>
 	<definition name="tiles:/monitoring/forum/defineLaterForbidden" extends="tiles:layout">
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r6f2921676dc2b18ab8f8471a40d95e5db1ffa92c -r6bb2802253132bb7da7aa0e9dba50f94dd617f3a
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 6f2921676dc2b18ab8f8471a40d95e5db1ffa92c)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 6bb2802253132bb7da7aa0e9dba50f94dd617f3a)
@@ -220,24 +220,92 @@
 
 	</jsp-config>
 
-   <!--
-   To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
-   Organize web-security.xml following this DTD slice:
+  	<!--  Security Constraint -->
+	<security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Secure Content</web-resource-name>
+			<url-pattern>/*</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>LEARNER</role-name>
+    		<role-name>TEACHER</role-name>
+    		<role-name>STAFF</role-name>
+    		<role-name>AUTHOR</role-name>
+    		<role-name>ADMIN</role-name>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
-   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
-   <!ELEMENT web-resource-name (#PCDATA)>
-   <!ELEMENT url-pattern (#PCDATA)>
-   <!ELEMENT http-method (#PCDATA)>
-   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
-   <!ELEMENT transport-guarantee (#PCDATA)>
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Authoring Update</web-resource-name>
+		    <url-pattern>/authoring.do</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>AUTHOR</role-name>
+    	</auth-constraint>
+    </security-constraint>
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Staff Content</web-resource-name>
+		    <url-pattern>/monitoring.do</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>STAFF</role-name>
+    		<role-name>TEACHER</role-name>
+    	</auth-constraint>
+    </security-constraint>
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Staff Content</web-resource-name>
+		    <url-pattern>/definelater.do</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>STAFF</role-name>
+    		<role-name>TEACHER</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
-   <!ELEMENT auth-method (#PCDATA)>
-   <!ELEMENT realm-name (#PCDATA)>
-   <!ELEMENT form-login-config (form-login-page, form-error-page)>
-   <!ELEMENT form-login-page (#PCDATA)>
-   <!ELEMENT form-error-page (#PCDATA)>
-   -->
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Adminstrator Content</web-resource-name>
+		    <url-pattern>/admin.do</url-pattern> 
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>ADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>LAMS System Adminstrator Content</web-resource-name>
+		    <url-pattern>/sysadmin.do</url-pattern> 
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
+	<!--  some combine role security setting -->
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Download Files</web-resource-name>
+		    <url-pattern>/download/</url-pattern>
+    	</web-resource-collection>
+    	<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>
+    </security-constraint>
 
+	<!--  Login Configuration -->
+  	<login-config>
+   		<auth-method>FORM</auth-method>
+		<realm-name>LAMS</realm-name>
+   		<form-login-config>
+    		<form-login-page>/login.jsp</form-login-page>
+   		</form-login-config>
+   	</login-config>
+
 </web-app>
Index: lams_tool_forum/web/jsps/authoring/definelater.jsp
===================================================================
diff -u -rdf638eb558ae2d18b300343911aa8e07e66e9697 -r6bb2802253132bb7da7aa0e9dba50f94dd617f3a
--- lams_tool_forum/web/jsps/authoring/definelater.jsp	(.../definelater.jsp)	(revision df638eb558ae2d18b300343911aa8e07e66e9697)
+++ lams_tool_forum/web/jsps/authoring/definelater.jsp	(.../definelater.jsp)	(revision 6bb2802253132bb7da7aa0e9dba50f94dd617f3a)
@@ -14,19 +14,14 @@
 	<html:hidden property="mode" value="teacher" />
 
 	<div id="header">
-	<!-- start tabs -->
-	<lams:Tabs collection="${tabs}" useKey="true" control="true" />
-	<!-- end tab buttons -->
+		<lams:Tabs collection="${tabs}" useKey="true" control="true" />
 	</div>
 	
 	<div id="content">
-		<!-- tab content 1 (Basic) -->
 		<lams:TabBody id="1" titleKey="authoring.tab.basic" page="basic.jsp" />
-		<!-- end of content (Basic) -->
 
 		<!-- Button Row -->
 		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ForumConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.toolContentID}" accessMode="teacher" defineLater="yes"/>
-
 		<lams:HTMLEditor />
 	</div>
 </html:form>
Index: lams_tool_forum/web/jsps/authoring/definelaterheader.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/definelaterheader.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/definelaterheader.jsp	(revision 6bb2802253132bb7da7aa0e9dba50f94dd617f3a)
@@ -0,0 +1,35 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+	<script>
+    
+    	var imgRoot="${lams}images/";
+	    var themeName="aqua";
+        
+        function init(){
+        
+            initTabSize(1);
+            
+            selectTab(1); //select the default tab;
+            
+            initEditor("Title");
+            initEditor("Instructions");
+            initEditor("OnlineInstruction");
+            initEditor("OfflineInstruction");
+            
+        }     
+        
+        function doSelectTab(tabId) {
+        	// start optional tab controller stuff
+        	var tag = document.getElementById("currentTab");
+	    	tag.value = tabId;
+	    	// end optional tab controller stuff
+	    	selectTab(tabId);
+        } 
+        
+       
+    </script>
\ No newline at end of file
Index: lams_tool_forum/web/login.jsp
===================================================================
diff -u
--- lams_tool_forum/web/login.jsp	(revision 0)
+++ lams_tool_forum/web/login.jsp	(revision 6bb2802253132bb7da7aa0e9dba50f94dd617f3a)
@@ -0,0 +1,24 @@
+
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
+<%
+String path = request.getContextPath();
+String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <base href="<%=basePath%>">
+    
+    <title>System logon required</title>
+
+    <!--
+    <link rel="stylesheet" type="text/css" href="styles.css">
+    -->
+  </head>
+  
+  <body>
+	You need login <a href="/lams/index.jsp">here</a>.
+
+  </body>
+</html>