Index: lams_tool_vote/test/web/WEB-INF/web.xml
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r0732f5d12802da95cf69e474b30630653924abc5
--- lams_tool_vote/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
@@ -35,6 +35,7 @@
 				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
 				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
+				classpath:/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml
 			</param-value>
 	</context-param>
 
@@ -86,8 +87,8 @@
 	
 	<listener>
 		<listener-class>
-	 		org.lamsfoundation.lams.web.SessionListener
-	 	</listener-class>
+			org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+		</listener-class>
 	</listener>
 
 	<servlet>
@@ -136,7 +137,7 @@
 <!--  FCKEditor Connector Configuration -->
 	<servlet>
 		<servlet-name>Connector</servlet-name>
-		<servlet-class>com.fredck.FCKeditor.connector.ConnectorServlet</servlet-class>
+		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
 		<init-param>
 			<param-name>baseDir</param-name>
 			<param-value>/UserFiles/</param-value>
@@ -172,10 +173,6 @@
 	    <servlet-name>Connector</servlet-name>
 	    <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
 	</servlet-mapping>
-
-   	<session-config>
-      	<session-timeout>120</session-timeout>
-   	</session-config>
    
     <error-page>
         <error-code>500</error-code>
@@ -285,16 +282,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 +338,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>