Index: lams_tool_wiki/conf/xdoclet/web-security.xml
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc
--- lams_tool_wiki/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc)
@@ -1,103 +1,80 @@
 	<!--  Security Constraint -->
 	<security-constraint>
 	   	<web-resource-collection>
-	    	<web-resource-name>Secure Content</web-resource-name>
-    		<url-pattern>*.jsp</url-pattern>
-    		<url-pattern>*.html</url-pattern>
-    		<url-pattern>*.do</url-pattern>
+	    	<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>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
-    		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
-    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
 
     <security-constraint>
 	   	<web-resource-collection>
-	    	<web-resource-name>Authoring Update</web-resource-name>
+	    	<web-resource-name>Authoring content</web-resource-name>
+		    <url-pattern>/pages/authoring/*</url-pattern>
 		    <url-pattern>/authoring.do</url-pattern>
+		    <url-pattern>/pedagogicalPlanner.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>AUTHOR ADMIN</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     
     <security-constraint>
 	   	<web-resource-collection>
-	    	<web-resource-name>Staff Content</web-resource-name>
+	    	<web-resource-name>Staff content</web-resource-name>
+		    <url-pattern>/pages/monitoring/*</url-pattern>
 		    <url-pattern>/monitoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>MONITOR</role-name>
-    		<role-name>TEACHER</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>MONITOR</role-name>
-    		<role-name>TEACHER</role-name>
-    		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
-    		<role-name>AUTHOR ADMIN</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-error-page>/login.jsp?failed=y</form-error-page>
-   		</form-login-config>
-   	</login-config>
-    <!-- ======================================================== -->
 	<!--  Security Roles -->
-    <!-- ======================================================== -->
 	<security-role>
 		<description>Student</description>
 		<role-name>LEARNER</role-name>
 	</security-role>
-	<security-role>
-		<description>Student</description>
-		<role-name>TEACHER</role-name>
-	</security-role>
 
 	<security-role>
-		<description>Can create/modify a learning design</description>
+		<description>Authors Learning Designs</description>
 		<role-name>AUTHOR</role-name>
 	</security-role>
 
 	<security-role>
-		<description>Can running and monitoring a learning session</description>
+		<description>Member of Staff</description>
 		<role-name>MONITOR</role-name>
 	</security-role>
 
 	<security-role>
-		<description>Can add/remove users to the system, set up classes of users for sessions</description>
-		<role-name>ADMIN</role-name>
+		<description>Group Manager</description>
+		<role-name>GROUP MANAGER</role-name>
 	</security-role>
-
+	
 	<security-role>
-		<description>Can add/remove users to the system, set up classes of users for sessions</description>
-		<role-name>SYSADMIN</role-name>
+		<description>Group Administrator</description>
+		<role-name>GROUP ADMIN</role-name>
 	</security-role>
 	
 	<security-role>
-		<description>Can create/modify a learning design and edit default tool content</description>
-		<role-name>AUTHOR ADMIN</role-name>
+		<description>LAMS System Adminstrator</description>
+		<role-name>SYSADMIN</role-name>
 	</security-role>
+
+	<!--  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-error-page>/login.jsp?failed=y</form-error-page>
+		</form-login-config>
+	</login-config>
\ No newline at end of file