Index: lams_central/conf/xdoclet/web-security.xml
===================================================================
diff -u -r9cf6f80b33044116d7378e7eb384f771ac486a6b -re858e6202ce59bafb943ba2123243d3819d1ce9d
--- lams_central/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 9cf6f80b33044116d7378e7eb384f771ac486a6b)
+++ lams_central/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision e858e6202ce59bafb943ba2123243d3819d1ce9d)
@@ -9,10 +9,10 @@
     	</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>COURSE MANAGER</role-name>
+    		<role-name>COURSE ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -37,27 +37,6 @@
     	</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>
@@ -67,7 +46,8 @@
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
     		<role-name>STAFF</role-name>
-    		<role-name>ADMIN</role-name>
+    	    <role-name>COURSE MANAGER</role-name>
+    		<role-name>COURSE ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -88,10 +68,6 @@
 		<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>
@@ -103,10 +79,12 @@
 		<role-name>STAFF</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>
+    <security-role>
+		<role-name>COURSE MANAGER</role-name>
 	</security-role>
+   	<security-role>
+		<role-name>COURSE ADMIN</role-name>
+	</security-role>
 
 	<security-role>
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>