Index: lams_build/conf/j2ee/application.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/j2ee/Attic/application.xml,v
diff -u -r1.28 -r1.29
--- lams_build/conf/j2ee/application.xml	8 Aug 2006 03:09:28 -0000	1.28
+++ lams_build/conf/j2ee/application.xml	1 Sep 2006 05:56:13 -0000	1.29
@@ -24,7 +24,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
 	<security-role>
Index: lams_central/conf/xdoclet/web-security.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/web-security.xml,v
diff -u -r1.5 -r1.6
--- lams_central/conf/xdoclet/web-security.xml	18 Jul 2006 00:58:28 -0000	1.5
+++ lams_central/conf/xdoclet/web-security.xml	1 Sep 2006 05:56:11 -0000	1.6
@@ -9,7 +9,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     	    <role-name>COURSE MANAGER</role-name>
     		<role-name>COURSE ADMIN</role-name>
@@ -33,7 +33,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -45,7 +45,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     	    <role-name>COURSE MANAGER</role-name>
     		<role-name>COURSE ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -76,7 +76,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
     <security-role>
Index: lams_learning/conf/xdoclet/web-security.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/web-security.xml,v
diff -u -r1.2 -r1.3
--- lams_learning/conf/xdoclet/web-security.xml	24 Feb 2006 08:26:04 -0000	1.2
+++ lams_learning/conf/xdoclet/web-security.xml	1 Sep 2006 05:56:14 -0000	1.3
@@ -7,7 +7,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
Index: lams_learning/test/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/web/WEB-INF/Attic/web.xml,v
diff -u -r1.6 -r1.7
--- lams_learning/test/web/WEB-INF/web.xml	23 Jun 2006 07:58:00 -0000	1.6
+++ lams_learning/test/web/WEB-INF/web.xml	1 Sep 2006 05:56:14 -0000	1.7
@@ -221,7 +221,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
Index: lams_monitoring/conf/xdoclet/web-security.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/xdoclet/web-security.xml,v
diff -u -r1.1 -r1.2
--- lams_monitoring/conf/xdoclet/web-security.xml	23 Jun 2006 07:53:39 -0000	1.1
+++ lams_monitoring/conf/xdoclet/web-security.xml	1 Sep 2006 05:56:14 -0000	1.2
@@ -7,7 +7,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
Index: lams_tool_chat/conf/xdoclet/web-security.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/conf/xdoclet/web-security.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_chat/conf/xdoclet/web-security.xml	11 May 2006 06:56:56 -0000	1.2
+++ lams_tool_chat/conf/xdoclet/web-security.xml	1 Sep 2006 05:58:01 -0000	1.3
@@ -9,7 +9,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -32,7 +32,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -45,7 +45,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -80,7 +80,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
 	<security-role>
Index: lams_tool_forum/conf/xdoclet/web-security.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/web-security.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/conf/xdoclet/web-security.xml	12 Jul 2006 06:27:46 -0000	1.2
+++ lams_tool_forum/conf/xdoclet/web-security.xml	1 Sep 2006 05:56:12 -0000	1.3
@@ -7,7 +7,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -29,7 +29,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -39,7 +39,7 @@
 		    <url-pattern>/definelater.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -70,7 +70,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -96,7 +96,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
 	<security-role>
Index: lams_tool_lamc/test/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/test/web/WEB-INF/Attic/web.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/test/web/WEB-INF/web.xml	14 Apr 2006 06:18:01 -0000	1.7
+++ lams_tool_lamc/test/web/WEB-INF/web.xml	1 Sep 2006 05:56:15 -0000	1.8
@@ -128,7 +128,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -144,7 +144,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -170,7 +170,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>		   
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -183,7 +183,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
Index: lams_tool_laqa/test/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/web/WEB-INF/Attic/web.xml,v
diff -u -r1.10 -r1.11
--- lams_tool_laqa/test/web/WEB-INF/web.xml	14 Apr 2006 06:18:54 -0000	1.10
+++ lams_tool_laqa/test/web/WEB-INF/web.xml	1 Sep 2006 05:56:12 -0000	1.11
@@ -207,7 +207,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -233,7 +233,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>		   
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -246,7 +246,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
Index: lams_tool_larsrc/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/web.xml,v
diff -u -r1.10 -r1.11
--- lams_tool_larsrc/web/WEB-INF/web.xml	24 Jul 2006 04:51:42 -0000	1.10
+++ lams_tool_larsrc/web/WEB-INF/web.xml	1 Sep 2006 05:56:14 -0000	1.11
@@ -213,7 +213,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -235,7 +235,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -245,7 +245,7 @@
 		    <url-pattern>/definelater.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -276,7 +276,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -302,7 +302,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
 	<security-role>
Index: lams_tool_nb/conf/xdoclet/web-security.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/conf/xdoclet/web-security.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_nb/conf/xdoclet/web-security.xml	11 May 2006 06:56:37 -0000	1.3
+++ lams_tool_nb/conf/xdoclet/web-security.xml	1 Sep 2006 05:56:12 -0000	1.4
@@ -7,7 +7,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -34,7 +34,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>		   
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -48,7 +48,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
Index: lams_tool_notebook/conf/xdoclet/web-security.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/conf/xdoclet/web-security.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_notebook/conf/xdoclet/web-security.xml	20 Jul 2006 01:11:09 -0000	1.1
+++ lams_tool_notebook/conf/xdoclet/web-security.xml	1 Sep 2006 05:58:37 -0000	1.2
@@ -9,7 +9,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -32,7 +32,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -45,7 +45,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -80,7 +80,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
 	<security-role>
Index: lams_tool_sbmt/conf/xdoclet/web-security.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/web-security.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/conf/xdoclet/web-security.xml	12 Jul 2006 06:27:46 -0000	1.4
+++ lams_tool_sbmt/conf/xdoclet/web-security.xml	1 Sep 2006 05:56:15 -0000	1.5
@@ -7,7 +7,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -30,7 +30,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -64,7 +64,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -90,7 +90,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
 	<security-role>
Index: lams_tool_vote/test/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/test/web/WEB-INF/Attic/web.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_vote/test/web/WEB-INF/web.xml	14 Apr 2006 06:31:09 -0000	1.3
+++ lams_tool_vote/test/web/WEB-INF/web.xml	1 Sep 2006 05:56:13 -0000	1.4
@@ -128,7 +128,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -144,7 +144,7 @@
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
@@ -170,7 +170,7 @@
 		    <url-pattern>/monitoring.do</url-pattern>		   
     	</web-resource-collection>
     	<auth-constraint>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     	</auth-constraint>
     </security-constraint>
 
@@ -183,7 +183,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
Index: lams_www/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/web.xml,v
diff -u -r1.1 -r1.2
--- lams_www/web/WEB-INF/web.xml	8 Aug 2006 02:33:42 -0000	1.1
+++ lams_www/web/WEB-INF/web.xml	1 Sep 2006 05:56:13 -0000	1.2
@@ -109,7 +109,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
-    		<role-name>STAFF</role-name>
+    		<role-name>MONITOR</role-name>
     		<role-name>AUTHOR</role-name>
     	    <role-name>COURSE MANAGER</role-name>
     		<role-name>COURSE ADMIN</role-name>
@@ -141,7 +141,7 @@
 
 	<security-role>
 		<description>Can running and monitoring a learning session</description>
-		<role-name>STAFF</role-name>
+		<role-name>MONITOR</role-name>
 	</security-role>
 
     <security-role>