Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
diff -u -r1d2ff22c947ab0d5646bb02b8189ca668020bdbc -r0c0cbdac26679e47d5c48e045c30e5496e1f809b
--- lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 1d2ff22c947ab0d5646bb02b8189ca668020bdbc)
+++ lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 0c0cbdac26679e47d5c48e045c30e5496e1f809b)
@@ -1,147 +1,139 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
- <!--
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_1.xsd"
+	version="3.1">
+	<!-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) This 
+		program is free software; you can redistribute it and/or modify it under 
+		the terms of the GNU General Public License as published by the Free Software 
+		Foundation; either version 2 of the License, or (at your option) any later 
+		version. This program is distributed in the hope that it will be useful, 
+		but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+		or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for 
+		more details. You should have received a copy of the GNU General Public License 
+		along with this program; if not, write to the Free Software Foundation, Inc., 
+		51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA http://www.gnu.org/licenses/gpl.txt -->
+	<context-param>
+		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+		<param-value>org.lamsfoundation.lams.tool.vote.ApplicationResources</param-value>
+	</context-param>
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>classpath:/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml</param-value>
+	</context-param>
+	<context-param>
+		<param-name>locatorFactorySelector</param-name>
+		<param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
+	</context-param>
+	<context-param>
+		<param-name>parentContextKey</param-name>
+		<param-value>context.central</param-value>
+	</context-param>
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+	<filter>
+		<filter-name>UrlRewriteFilter</filter-name>
+		<filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
+	</filter>
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-USA
+	<filter-mapping>
+		<filter-name>UrlRewriteFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+		<dispatcher>FORWARD</dispatcher>
+	</filter-mapping>
 
-http://www.gnu.org/licenses/gpl.txt
--->
-<context-param>
-	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.tool.vote.ApplicationResources</param-value>
-</context-param>
-	
-<context-param> 
-	<param-name>contextConfigLocation</param-name>
-	<param-value>classpath:/org/lamsfoundation/lams/tool/vote/dbupdates/autopatchContext.xml</param-value>
-</context-param>
-<context-param>
-   <param-name>locatorFactorySelector</param-name>
-   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
-</context-param>
-<context-param>
-	<param-name>parentContextKey</param-name>
-	<param-value>context.central</param-value>
-</context-param>
+	<filter>
+		<filter-name>SystemSessionFilter</filter-name>
+		<filter-class>
+			org.lamsfoundation.lams.web.session.SystemSessionFilter
+		</filter-class>
+	</filter>
 
-    <filter>
-        <filter-name>UrlRewriteFilter</filter-name>
-        <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
-     </filter>
-
-    <filter-mapping>
-        <filter-name>UrlRewriteFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-        <dispatcher>REQUEST</dispatcher>
-        <dispatcher>FORWARD</dispatcher>
-    </filter-mapping>
-
-    <filter>
-	    <filter-name>SystemSessionFilter</filter-name>
-	     <filter-class>
-		   org.lamsfoundation.lams.web.session.SystemSessionFilter
-	     </filter-class>
-  	</filter>
-  	
-  	<filter>
-	    <filter-name>hibernateFilter</filter-name>
-	    <filter-class>
-	      org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter
-	    </filter-class>
+	<filter>
+		<filter-name>hibernateFilter</filter-name>
+		<filter-class>
+			org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter
+		</filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
-		    <param-value>coreSessionFactory</param-value>
+			<param-value>coreSessionFactory</param-value>
 		</init-param>
-   </filter>
+	</filter>
 
 	<filter>
 		<filter-name>LocaleFilter</filter-name>
-         <filter-class>
-		   org.lamsfoundation.lams.web.filter.LocaleFilter
-         </filter-class>
+		<filter-class>
+			org.lamsfoundation.lams.web.filter.LocaleFilter
+		</filter-class>
 	</filter>
 
-    <filter-mapping>
-    	<filter-name>SystemSessionFilter</filter-name>
-     	<url-pattern>/*</url-pattern> 
-  	</filter-mapping>
-  
-   <filter-mapping>
-    	<filter-name>hibernateFilter</filter-name>
-     	<url-pattern>/*</url-pattern>
-  	</filter-mapping>
+	<filter-mapping>
+		<filter-name>SystemSessionFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
 
 	<filter-mapping>
-    	<filter-name>LocaleFilter</filter-name>
-	     <url-pattern>/*</url-pattern>
-   </filter-mapping>
+		<filter-name>hibernateFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
 
-  	<listener>
+	<filter-mapping>
+		<filter-name>LocaleFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<listener>
 		<listener-class>
-		org.springframework.web.context.ContextLoaderListener
+			org.springframework.web.context.ContextLoaderListener
 		</listener-class>
-	</listener>	
-	
+	</listener>
+
 	<listener>
 		<listener-class>
 			org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
 		</listener-class>
 	</listener>
 
 	<servlet>
-	    <servlet-name>action</servlet-name>
-	    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-	    <init-param>
-	      <param-name>config</param-name>
-	      <param-value>/WEB-INF/struts-config.xml</param-value>
-	    </init-param>
-	    <init-param>
-	      <param-name>debug</param-name>
-	      <param-value>999</param-value>
-	    </init-param>
-	    <init-param>
-	      <param-name>detail</param-name>
-	      <param-value>2</param-value>
-	    </init-param>
-	    <init-param>
-	      <param-name>validate</param-name>
-	      <param-value>true</param-value>
-	    </init-param>
-	    <load-on-startup>1</load-on-startup>
-    </servlet>
+		<servlet-name>action</servlet-name>
+		<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+		<init-param>
+			<param-name>config</param-name>
+			<param-value>/WEB-INF/struts-config.xml</param-value>
+		</init-param>
+		<init-param>
+			<param-name>debug</param-name>
+			<param-value>999</param-value>
+		</init-param>
+		<init-param>
+			<param-name>detail</param-name>
+			<param-value>2</param-value>
+		</init-param>
+		<init-param>
+			<param-name>validate</param-name>
+			<param-value>true</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
 
 	<servlet>
 		<servlet-name>download</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
-	    <init-param>
-	      <param-name>toolContentHandlerBeanName</param-name>
-	      <param-value>voteToolContentHandler</param-value>
-	    </init-param>
-	    <load-on-startup>3</load-on-startup>
+		<init-param>
+			<param-name>toolContentHandlerBeanName</param-name>
+			<param-value>voteToolContentHandler</param-value>
+		</init-param>
+		<load-on-startup>3</load-on-startup>
 	</servlet>
-	
+
 	<servlet>
 		<servlet-name>exportPortfolio</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.tool.vote.web.ExportServlet</servlet-class>
 	</servlet>
 
 
-<!--  FCKEditor Connector Configuration -->
+	<!-- FCKEditor Connector Configuration -->
 	<servlet>
 		<servlet-name>Connector</servlet-name>
 		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
@@ -158,182 +150,176 @@
 
 	<servlet-mapping>
 		<servlet-name>action</servlet-name>
-	    <url-pattern>*.do</url-pattern>
+		<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
 	<servlet-mapping>
 		<servlet-name>download</servlet-name>
 		<url-pattern>/download/*</url-pattern>
-  	</servlet-mapping>
+	</servlet-mapping>
 
-  	<servlet-mapping>
+	<servlet-mapping>
 		<servlet-name>exportPortfolio</servlet-name>
 		<url-pattern>/exportPortfolio/*</url-pattern>
-  	</servlet-mapping>
+	</servlet-mapping>
 
 	<servlet-mapping>
-	    <servlet-name>Connector</servlet-name>
-	    <url-pattern>/ckeditor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+		<servlet-name>Connector</servlet-name>
+		<url-pattern>/ckeditor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
 	</servlet-mapping>
-   
-    <error-page>
-        <error-code>500</error-code>
-        <location>/error.jsp</location>
-    </error-page>
-    <error-page>
-        <error-code>403</error-code>
-        <location>/403.jsp</location>
-    </error-page>
-    <error-page>
-        <error-code>404</error-code>
-        <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)>
-   -->
+	<error-page>
+		<error-code>500</error-code>
+		<location>/error.jsp</location>
+	</error-page>
+	<error-page>
+		<error-code>403</error-code>
+		<location>/403.jsp</location>
+	</error-page>
+	<error-page>
+		<error-code>404</error-code>
+		<location>/404.jsp</location>
+	</error-page>
 
-   <!--
-   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:
+	<!-- 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)> -->
 
-   <!ELEMENT error-page ((error-code | exception-type), location)>
-   -->
-   
+	<!-- 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>
 
-		<!--  ======================================================== -->	
+		<!-- ======================================================== -->
 		<!-- Struts Tag Library Descriptors -->
-		<!--  ======================================================== -->	
+		<!-- ======================================================== -->
 		<taglib>
-		    <taglib-uri>tags-bean</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
+			<taglib-uri>tags-bean</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
 		</taglib>
-		
+
 		<taglib>
-		    <taglib-uri>tags-html</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
+			<taglib-uri>tags-html</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
 		</taglib>
-		
+
 		<taglib>
-		    <taglib-uri>tags-logic</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
+			<taglib-uri>tags-logic</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
 		</taglib>
-		
+
 		<taglib>
-		    <taglib-uri>tags-tiles</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
+			<taglib-uri>tags-tiles</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
 		</taglib>
-				
+
 		<taglib>
-		    <taglib-uri>tags-bean-el</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
+			<taglib-uri>tags-bean-el</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
 		</taglib>
 		<taglib>
-		    <taglib-uri>tags-html-el</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
+			<taglib-uri>tags-html-el</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
 		</taglib>
 		<taglib>
-		    <taglib-uri>tags-logic-el</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
+			<taglib-uri>tags-logic-el</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
 		</taglib>
 		<taglib>
-		    <taglib-uri>tags-tiles-el</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
+			<taglib-uri>tags-tiles-el</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
 		</taglib>
-		
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library 									   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-fmt</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/jstl/fmt.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-core</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/jstl/c.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-function</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/jstl/fn.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-xml</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/jstl/x.tld</taglib-location>
-		  </taglib>
-		
-		<!--  ======================================================== -->	
-		<!--  JSTL 1.2 Tag Library: Apache implementation of TLV	   -->
-		<!--  ======================================================== -->	
-		  <taglib>
-		    <taglib-uri>tags-permittedTaglibs</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/jstl/permittedTaglibs.tld</taglib-location>
-		  </taglib>
-		
-		  <taglib>
-		    <taglib-uri>tags-scriptfree</taglib-uri>
-		    <taglib-location>/WEB-INF/tlds/jstl/scriptfree.tld</taglib-location>
-		  </taglib>
-		   
-		<!--  ======================================================== -->	
-		<!--   Customized Tag Library -->
-		<!--  ======================================================== -->	
-		
-		 <taglib>
-		   <taglib-uri>tags-lams</taglib-uri>
-		   <taglib-location>/WEB-INF/tlds/lams/lams.tld</taglib-location>
+
+		<!-- ======================================================== -->
+		<!-- JSTL 1.2 Tag Library -->
+		<!-- ======================================================== -->
+		<taglib>
+			<taglib-uri>tags-fmt</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/jstl/fmt.tld</taglib-location>
 		</taglib>
 
+		<taglib>
+			<taglib-uri>tags-core</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/jstl/c.tld</taglib-location>
+		</taglib>
+
+		<taglib>
+			<taglib-uri>tags-function</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/jstl/fn.tld</taglib-location>
+		</taglib>
+
+		<taglib>
+			<taglib-uri>tags-xml</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/jstl/x.tld</taglib-location>
+		</taglib>
+
+		<!-- ======================================================== -->
+		<!-- JSTL 1.2 Tag Library: Apache implementation of TLV -->
+		<!-- ======================================================== -->
+		<taglib>
+			<taglib-uri>tags-permittedTaglibs</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/jstl/permittedTaglibs.tld</taglib-location>
+		</taglib>
+
+		<taglib>
+			<taglib-uri>tags-scriptfree</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/jstl/scriptfree.tld</taglib-location>
+		</taglib>
+
+		<!-- ======================================================== -->
+		<!-- Customized Tag Library -->
+		<!-- ======================================================== -->
+
+		<taglib>
+			<taglib-uri>tags-lams</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/lams/lams.tld</taglib-location>
+		</taglib>
+
 	</jsp-config>
 
-  	<!--  Security Constraint -->
+	<!-- Security Constraint -->
 	<security-constraint>
-	   	<web-resource-collection>
-	    	<web-resource-name>Secure content</web-resource-name>
+		<web-resource-collection>
+			<web-resource-name>Secure content</web-resource-name>
 			<url-pattern>/*</url-pattern>
-    	</web-resource-collection>
-    	<auth-constraint>
-    		<role-name>LEARNER</role-name>
-    		<role-name>MONITOR</role-name>
-    		<role-name>AUTHOR</role-name>
-    		<role-name>SYSADMIN</role-name>
-    	</auth-constraint>
-    </security-constraint>
+		</web-resource-collection>
+		<auth-constraint>
+			<role-name>LEARNER</role-name>
+			<role-name>MONITOR</role-name>
+			<role-name>AUTHOR</role-name>
+			<role-name>SYSADMIN</role-name>
+		</auth-constraint>
+	</security-constraint>
 
-    <security-constraint>
-	   	<web-resource-collection>
-	    	<web-resource-name>Authoring content</web-resource-name>
-		    <url-pattern>/authoring/*</url-pattern>
-		    <url-pattern>/authoring.do</url-pattern>
-		    <url-pattern>/authoringStarter.do</url-pattern>
-		    <url-pattern>/pedagogicalPlanner.do</url-pattern>
-    	</web-resource-collection>
-    	<auth-constraint>
-    		<role-name>AUTHOR</role-name>
-    		<role-name>MONITOR</role-name>
-    		<role-name>SYSADMIN</role-name>
-    	</auth-constraint>
-    </security-constraint>
-    <security-constraint>
-	   	<web-resource-collection>
-	    	<web-resource-name>Staff content</web-resource-name>
-		    <url-pattern>/monitoring/*</url-pattern>
-		    <url-pattern>/monitoring.do</url-pattern>
-		    <url-pattern>/monitoringStarter.do</url-pattern>
-    	</web-resource-collection>
-    	<auth-constraint>
-    		<role-name>MONITOR</role-name>
-    		<role-name>SYSADMIN</role-name>
-    	</auth-constraint>
-    </security-constraint>
-	
-	<!--  Security Roles -->
+	<security-constraint>
+		<web-resource-collection>
+			<web-resource-name>Authoring content</web-resource-name>
+			<url-pattern>/authoring/*</url-pattern>
+			<url-pattern>/authoring.do</url-pattern>
+			<url-pattern>/authoringStarter.do</url-pattern>
+			<url-pattern>/pedagogicalPlanner.do</url-pattern>
+		</web-resource-collection>
+		<auth-constraint>
+			<role-name>AUTHOR</role-name>
+			<role-name>MONITOR</role-name>
+			<role-name>SYSADMIN</role-name>
+		</auth-constraint>
+	</security-constraint>
+	<security-constraint>
+		<web-resource-collection>
+			<web-resource-name>Staff content</web-resource-name>
+			<url-pattern>/monitoring/*</url-pattern>
+			<url-pattern>/monitoring.do</url-pattern>
+			<url-pattern>/monitoringStarter.do</url-pattern>
+		</web-resource-collection>
+		<auth-constraint>
+			<role-name>MONITOR</role-name>
+			<role-name>SYSADMIN</role-name>
+		</auth-constraint>
+	</security-constraint>
+
+	<!-- Security Roles -->
 	<security-role>
 		<description>Student</description>
 		<role-name>LEARNER</role-name>
@@ -358,20 +344,25 @@
 		<description>Group Administrator</description>
 		<role-name>GROUP ADMIN</role-name>
 	</security-role>
-	
+
 	<security-role>
 		<description>LAMS System Adminstrator</description>
 		<role-name>SYSADMIN</role-name>
 	</security-role>
-	
-	<!--  Login Configuration -->
-  	<login-config>
-   		<auth-method>FORM</auth-method>
+
+	<!-- Login Configuration -->
+	<login-config>
+		<auth-method>FORM</auth-method>
 		<realm-name>LAMS</realm-name>
-   		<form-login-config>
-    		<form-login-page>/login.jsp</form-login-page>
-			<form-error-page>/login.jsp?failed=y</form-error-page>    		    		
-   		</form-login-config>
-   	</login-config>
+		<form-login-config>
+			<form-login-page>/login.jsp</form-login-page>
+			<form-error-page>/login.jsp?failed=y</form-error-page>
+		</form-login-config>
+	</login-config>
 	
-</web-app>
+	<session-config>
+		<cookie-config>
+			<path>/lams</path>
+		</cookie-config>
+	</session-config>
+</web-app>
\ No newline at end of file