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.3 -r1.4
--- lams_tool_chat/conf/xdoclet/web-security.xml	1 Sep 2006 05:58:01 -0000	1.3
+++ lams_tool_chat/conf/xdoclet/web-security.xml	31 Oct 2006 05:11:01 -0000	1.4
@@ -13,6 +13,7 @@
     		<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>
 
@@ -23,6 +24,8 @@
     	</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>
     
@@ -49,6 +52,7 @@
     		<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>
 
@@ -92,3 +96,8 @@
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</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>
+	</security-role>
Index: lams_tool_chat/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/Attic/web.xml,v
diff -u -r1.16 -r1.17
--- lams_tool_chat/web/WEB-INF/web.xml	1 Oct 2006 22:33:09 -0000	1.16
+++ lams_tool_chat/web/WEB-INF/web.xml	31 Oct 2006 05:11:01 -0000	1.17
@@ -260,6 +260,7 @@
     		<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>
 
@@ -270,6 +271,8 @@
     	</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>
@@ -295,6 +298,7 @@
     		<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>
 
@@ -338,5 +342,9 @@
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</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>
+	</security-role>
 
 </web-app>
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.3 -r1.4
--- lams_tool_forum/conf/xdoclet/web-security.xml	1 Sep 2006 05:56:12 -0000	1.3
+++ lams_tool_forum/conf/xdoclet/web-security.xml	31 Oct 2006 05:11:01 -0000	1.4
@@ -11,6 +11,7 @@
     		<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>
 
@@ -21,6 +22,8 @@
     	</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>
@@ -51,6 +54,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>ADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
@@ -73,6 +77,7 @@
     		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -108,6 +113,12 @@
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</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>
+	</security-role>
+	
 	<!--  Login Configuration -->
   	<login-config>
    		<auth-method>FORM</auth-method>
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/web.xml,v
diff -u -r1.26 -r1.27
--- lams_tool_forum/web/WEB-INF/web.xml	6 Sep 2006 05:47:06 -0000	1.26
+++ lams_tool_forum/web/WEB-INF/web.xml	31 Oct 2006 05:11:01 -0000	1.27
@@ -241,6 +241,7 @@
     		<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>
 
@@ -251,6 +252,8 @@
     	</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>
@@ -281,6 +284,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>ADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
@@ -303,6 +307,7 @@
     		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     		<role-name>ADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
@@ -338,6 +343,10 @@
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</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>
+	</security-role>
 	<!--  Login Configuration -->
   	<login-config>
    		<auth-method>FORM</auth-method>
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/web.xml,v
diff -u -r1.23 -r1.24
--- lams_tool_lamc/web/WEB-INF/web.xml	2 Oct 2006 01:59:54 -0000	1.23
+++ lams_tool_lamc/web/WEB-INF/web.xml	31 Oct 2006 05:11:15 -0000	1.24
@@ -242,16 +242,19 @@
     		<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>
-		    <url-pattern>/authoring.do</url-pattern>
+		    <url-pattern>/authoringStarter.do</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>
@@ -272,6 +275,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>ADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
@@ -295,6 +299,7 @@
     		<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>
 
@@ -329,6 +334,12 @@
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</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>
+	</security-role>
+	
 	<!--  Login Configuration -->
   	<login-config>
    		<auth-method>FORM</auth-method>
Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/web.xml,v
diff -u -r1.25 -r1.26
--- lams_tool_laqa/web/WEB-INF/web.xml	20 Sep 2006 15:15:44 -0000	1.25
+++ lams_tool_laqa/web/WEB-INF/web.xml	31 Oct 2006 05:12:46 -0000	1.26
@@ -248,10 +248,12 @@
     <security-constraint>
 	   	<web-resource-collection>
 	    	<web-resource-name>Authoring Update</web-resource-name>
-		    <url-pattern>/authoring.do</url-pattern>
+		    <url-pattern>/authoringStarter.do</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>
@@ -272,6 +274,7 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>ADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
@@ -295,6 +298,7 @@
     		<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>
 
@@ -329,6 +333,12 @@
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</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>
+	</security-role>
+	
 	<!--  Login Configuration -->
   	<login-config>
    		<auth-method>FORM</auth-method>
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.13 -r1.14
--- lams_tool_larsrc/web/WEB-INF/web.xml	31 Oct 2006 02:15:42 -0000	1.13
+++ lams_tool_larsrc/web/WEB-INF/web.xml	31 Oct 2006 05:12:56 -0000	1.14
@@ -217,6 +217,7 @@
     		<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>
 
@@ -282,6 +283,7 @@
     		<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>
 
@@ -316,6 +318,12 @@
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</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>
+	</security-role>
+	
 	<!--  Login Configuration -->
   	<login-config>
    		<auth-method>FORM</auth-method>
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.4 -r1.5
--- lams_tool_nb/conf/xdoclet/web-security.xml	1 Sep 2006 05:56:12 -0000	1.4
+++ lams_tool_nb/conf/xdoclet/web-security.xml	31 Oct 2006 05:17:08 -0000	1.5
@@ -11,6 +11,7 @@
     		<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>
 
@@ -23,6 +24,8 @@
 		 </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>
     
@@ -52,6 +55,7 @@
     		<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>
 
@@ -64,3 +68,40 @@
     		<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>
+		<role-name>AUTHOR</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can running and monitoring a learning session</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>
+	</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>
+	</security-role>
+	
+	<security-role>
+		<description>Can create/modify a learning design and edit default tool content</description>
+		<role-name>AUTHOR ADMIN</role-name>
+	</security-role>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/Attic/web.xml,v
diff -u -r1.18 -r1.19
--- lams_tool_nb/web/WEB-INF/web.xml	17 Sep 2006 06:26:26 -0000	1.18
+++ lams_tool_nb/web/WEB-INF/web.xml	31 Oct 2006 05:17:08 -0000	1.19
@@ -226,6 +226,7 @@
     		<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>
 
@@ -238,6 +239,8 @@
 		 </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>
@@ -264,6 +267,7 @@
     		<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>
 
@@ -277,4 +281,40 @@
    		</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>
+		<role-name>AUTHOR</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can running and monitoring a learning session</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>
+	</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>
+	</security-role>
+	<security-role>
+		<description>Can create/modify a learning design and edit default tool content</description>
+		<role-name>AUTHOR ADMIN</role-name>
+	</security-role>
+
 </web-app>
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.2 -r1.3
--- lams_tool_notebook/conf/xdoclet/web-security.xml	1 Sep 2006 05:58:37 -0000	1.2
+++ lams_tool_notebook/conf/xdoclet/web-security.xml	31 Oct 2006 05:13:38 -0000	1.3
@@ -13,6 +13,7 @@
     		<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>
 
@@ -23,6 +24,8 @@
     	</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>
     
@@ -49,6 +52,7 @@
     		<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>
 
@@ -92,3 +96,8 @@
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</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>
+	</security-role>
Index: lams_tool_notebook/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/Attic/web.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_notebook/web/WEB-INF/web.xml	31 Oct 2006 03:54:59 -0000	1.3
+++ lams_tool_notebook/web/WEB-INF/web.xml	31 Oct 2006 05:13:11 -0000	1.4
@@ -148,7 +148,14 @@
       <session-timeout>120</session-timeout>
    </session-config>
 
-	<error-page>
+   <!--
+   To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
+   Organize mime-mappings.xml following this DTD slice:
+
+   <!ELEMENT mime-mapping (extension, mime-type)>
+   -->
+
+      <error-page>
         <error-code>500</error-code>
         <location>/error.jsp</location>
     </error-page>
@@ -161,20 +168,6 @@
         <location>/404.jsp</location>
     </error-page>
 
-   <!--
-   To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
-   Organize mime-mappings.xml following this DTD slice:
-
-   <!ELEMENT mime-mapping (extension, mime-type)>
-   -->
-
-   <!--
-   To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
-   Organize error-pages.xml following this DTD slice:
-
-   <!ELEMENT error-page ((error-code | exception-type), location)>
-   -->
-
   	<jsp-config>
 
 		<!--  ======================================================== -->	
@@ -255,6 +248,7 @@
     		<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>
 
@@ -265,6 +259,8 @@
     	</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>
@@ -290,6 +286,7 @@
     		<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>
 
@@ -333,5 +330,9 @@
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</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>
+	</security-role>
 
 </web-app>
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.5 -r1.6
--- lams_tool_sbmt/conf/xdoclet/web-security.xml	1 Sep 2006 05:56:15 -0000	1.5
+++ lams_tool_sbmt/conf/xdoclet/web-security.xml	31 Oct 2006 05:13:39 -0000	1.6
@@ -11,6 +11,7 @@
     		<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>
 
@@ -21,6 +22,8 @@
     	</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>
     
@@ -68,6 +71,7 @@
     		<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>
 
@@ -103,6 +107,11 @@
 		<role-name>SYSADMIN</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>
+	</security-role>
+	
 	<!--  Login Configuration -->
   	<login-config>
    		<auth-method>FORM</auth-method>
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/Attic/web.xml,v
diff -u -r1.20 -r1.21
--- lams_tool_sbmt/web/WEB-INF/web.xml	5 Sep 2006 04:05:23 -0000	1.20
+++ lams_tool_sbmt/web/WEB-INF/web.xml	31 Oct 2006 05:13:39 -0000	1.21
@@ -230,6 +230,7 @@
     		<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>
 
@@ -240,6 +241,8 @@
     	</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>
@@ -283,6 +286,7 @@
     		<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>
 
@@ -317,6 +321,10 @@
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</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>
+	</security-role>
 	<!--  Login Configuration -->
   	<login-config>
    		<auth-method>FORM</auth-method>
Index: lams_tool_scribe/conf/xdoclet/web-security.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/conf/xdoclet/web-security.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_scribe/conf/xdoclet/web-security.xml	15 Sep 2006 03:09:52 -0000	1.1
+++ lams_tool_scribe/conf/xdoclet/web-security.xml	31 Oct 2006 05:14:01 -0000	1.2
@@ -13,6 +13,7 @@
     		<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>
 
@@ -23,6 +24,8 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
+    		<role-name>SYSADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     
@@ -49,6 +52,7 @@
     		<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>
 
@@ -92,3 +96,8 @@
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</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>
+	</security-role>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/Attic/web.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_scribe/web/WEB-INF/web.xml	12 Oct 2006 02:49:04 -0000	1.3
+++ lams_tool_scribe/web/WEB-INF/web.xml	31 Oct 2006 05:14:01 -0000	1.4
@@ -248,6 +248,7 @@
     		<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>
 
@@ -258,6 +259,8 @@
     	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
+    		<role-name>SYSADMIN</role-name>
+    		<role-name>AUTHOR ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
@@ -283,6 +286,7 @@
     		<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>
 
@@ -327,4 +331,9 @@
 		<role-name>SYSADMIN</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>
+	</security-role>
+
 </web-app>
Index: lams_tool_survey/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/web.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_survey/web/WEB-INF/web.xml	31 Oct 2006 03:37:47 -0000	1.5
+++ lams_tool_survey/web/WEB-INF/web.xml	31 Oct 2006 05:14:18 -0000	1.6
@@ -217,6 +217,7 @@
     		<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>
 
@@ -282,6 +283,7 @@
     		<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>
 
@@ -316,6 +318,12 @@
 		<description>Can add/remove users to the system, set up classes of users for sessions</description>
 		<role-name>SYSADMIN</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>
+	</security-role>
+	
 	<!--  Login Configuration -->
   	<login-config>
    		<auth-method>FORM</auth-method>
Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/web.xml,v
diff -u -r1.12 -r1.13
--- lams_tool_vote/web/WEB-INF/web.xml	26 Sep 2006 02:26:47 -0000	1.12
+++ lams_tool_vote/web/WEB-INF/web.xml	31 Oct 2006 05:17:08 -0000	1.13
@@ -285,16 +285,19 @@
     		<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>
-		    <url-pattern>/authoring.do</url-pattern>
+		    <url-pattern>/authoringStarter.do</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>
@@ -338,8 +341,45 @@
     		<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-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>
+		<role-name>AUTHOR</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can running and monitoring a learning session</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>
+	</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>
+	</security-role>
 	
+	<security-role>
+		<description>Can create/modify a learning design and edit default tool content</description>
+		<role-name>AUTHOR ADMIN</role-name>
+	</security-role>
+	
 </web-app>