Index: lams_tool_images/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/web.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_images/web/WEB-INF/web.xml	30 Jul 2012 18:51:46 -0000	1.7
+++ lams_tool_images/web/WEB-INF/web.xml	26 Sep 2014 11:32:59 -0000	1.8
@@ -230,123 +230,88 @@
 	<security-constraint>
 	   	<web-resource-collection>
 	    	<web-resource-name>Secure Content</web-resource-name>
-			<url-pattern>/*</url-pattern>
+    		<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>/authoring/*</url-pattern>
+		    <url-pattern>/pages/authoring/*</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>AUTHOR ADMIN</role-name>
     		<role-name>SYSADMIN</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>MONITOR</role-name>
-    		<role-name>TEACHER</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>/monitoring/*</url-pattern>
+		    <url-pattern>/pages/monitoring/*</url-pattern>
 		    <url-pattern>/definelater.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>MONITOR</role-name>
-    		<role-name>TEACHER</role-name>
+    		<role-name>SYSADMIN</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-name>Admin content</web-resource-name>
+		    <url-pattern>/pages/admin/*</url-pattern>
+		    <url-pattern>/laimag10admin/*</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>LEARNER</role-name>
-    		<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>
 
-  <!-- ======================================================== -->
-	<!--  Security Roles -->
-    <!-- ======================================================== -->
+  	<!--  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>
+		<description>Author Administrator</description>
 		<role-name>AUTHOR ADMIN</role-name>
 	</security-role>
 	
+	<security-role>
+		<description>LAMS System Adminstrator</description>
+		<role-name>SYSADMIN</role-name>
+	</security-role>
+	
 	<!--  Login Configuration -->
   	<login-config>
    		<auth-method>FORM</auth-method>