Index: lams_tool_chat/conf/xdoclet/web-security.xml
===================================================================
diff -u -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_chat/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
+++ lams_tool_chat/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_forum/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
+++ lams_tool_forum/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -r77c1dcf81bdd4127b6a1373977cd481899141d31 -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 77c1dcf81bdd4127b6a1373977cd481899141d31)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
+++ lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -r0db83894504dc7652d3670a6ce496605b961faa1 -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 0db83894504dc7652d3670a6ce496605b961faa1)
+++ lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -r4eff08d2d09df289874dc9002c73f455932a7cb1 -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision 4eff08d2d09df289874dc9002c73f455932a7cb1)
+++ lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_nb/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
+++ lams_tool_nb/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_notebook/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
+++ lams_tool_notebook/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -rcfcc53ff5c851843777649f07d8669a21b6fbff5 -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision cfcc53ff5c851843777649f07d8669a21b6fbff5)
+++ lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -r6c121bdc44accc3aed2703f1dcd3fd203fec0b3d -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_sbmt/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 6c121bdc44accc3aed2703f1dcd3fd203fec0b3d)
+++ lams_tool_sbmt/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -re7f9f5772bf6f3cf2786a65e78d7de441d348c37 -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision e7f9f5772bf6f3cf2786a65e78d7de441d348c37)
+++ lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_scribe/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/conf/xdoclet/web-security.xml	(.../web-security.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -r49bb60e6a46d42dc7fb5a0c51f839814cc0a9ccd -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_scribe/web/WEB-INF/web.xml	(.../web.xml)	(revision 49bb60e6a46d42dc7fb5a0c51f839814cc0a9ccd)
+++ lams_tool_scribe/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -r8a37793f1974554be031ff86ccf48f586126077b -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision 8a37793f1974554be031ff86ccf48f586126077b)
+++ lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r48ecaca457cd67a79a45aa681613f2d9f058e0d0
--- lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 48ecaca457cd67a79a45aa681613f2d9f058e0d0)
@@ -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>