Index: lams_tool_preview/web/WEB-INF/web.xml
===================================================================
diff -u -r9fc998daa072351bbb64ed9d16a1c571c8136b64 -r5e63656a12c02f7476564e278b43ff4ce86ac930
--- lams_tool_preview/web/WEB-INF/web.xml	(.../web.xml)	(revision 9fc998daa072351bbb64ed9d16a1c571c8136b64)
+++ lams_tool_preview/web/WEB-INF/web.xml	(.../web.xml)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
@@ -3,80 +3,75 @@
 <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">
-<display-name>Peer Review</display-name>
-<description>
-	Peer Review tool
-</description>
-<context-param>
-	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-	<param-value>org.lamsfoundation.lams.tool.peerreview.ApplicationResources</param-value>
-</context-param>
-<context-param> 
-	<param-name>contextConfigLocation</param-name>
-	<param-value>classpath:/org/lamsfoundation/lams/tool/peerreview/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>
+	<display-name>Peer Review</display-name>
+	<description>
+		Peer Review tool
+	</description>
+	<context-param>
+		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+		<param-value>org.lamsfoundation.lams.tool.peerreview.ApplicationResources</param-value>
+	</context-param>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>classpath:/org/lamsfoundation/lams/tool/peerreview/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>hibernateFilter</filter-name>
-	<filter-class>
-		org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter
-	</filter-class>
-	<init-param>
-		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>coreSessionFactory</param-value>
-	</init-param>
-</filter>
-<!-- System session filter -->
-<filter>
-	<filter-name>SystemSessionFilter</filter-name>
-	<filter-class>
-		org.lamsfoundation.lams.web.session.SystemSessionFilter
-	</filter-class>
-</filter>
-<filter>
-	<filter-name>LocaleFilter</filter-name>
-	<filter-class>
-		org.lamsfoundation.lams.web.filter.LocaleFilter
-	</filter-class>
-	<init-param>
-		<param-name>encoding</param-name>
-		<param-value>UTF-8</param-value>
-	</init-param>
-</filter>
+	<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>
+		</init-param>
+	</filter>
+	<!-- System session filter -->
+	<filter>
+		<filter-name>SystemSessionFilter</filter-name>
+		<filter-class>
+			org.lamsfoundation.lams.web.session.SystemSessionFilter
+		</filter-class>
+	</filter>
+	<filter>
+		<filter-name>LocaleFilter</filter-name>
+		<filter-class>
+			org.lamsfoundation.lams.web.filter.LocaleFilter
+		</filter-class>
+		<init-param>
+			<param-name>encoding</param-name>
+			<param-value>UTF-8</param-value>
+		</init-param>
+	</filter>
 
-<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>
+	<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>
 
-<listener>
-	<listener-class>
-		org.springframework.web.context.ContextLoaderListener
-	</listener-class>
-</listener>	
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>
 
 	<servlet>
-		<servlet-name>exportPortfolio</servlet-name>
-		<servlet-class>org.lamsfoundation.lams.tool.peerreview.web.servlet.ExportServlet</servlet-class>
-	</servlet>
-
-	<servlet>
 		<servlet-name>action</servlet-name>
 		<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
 		<init-param>
@@ -140,11 +135,6 @@
 		<url-pattern>/download/*</url-pattern>
 	</servlet-mapping>
 
-	<servlet-mapping>
-		<servlet-name>exportPortfolio</servlet-name>
-		<url-pattern>/exportPortfolio</url-pattern>
-	</servlet-mapping>
-
 	<error-page>
 		<error-code>500</error-code>
 		<location>/error.jsp</location>
@@ -235,47 +225,47 @@
 
 	</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>/pages/authoring/*</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>/pages/monitoring/*</url-pattern>
-		    <url-pattern>/definelater.do</url-pattern>
-    	</web-resource-collection>
-    	<auth-constraint>
-    		<role-name>MONITOR</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>/pages/authoring/*</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 Roles -->
+	<security-constraint>
+		<web-resource-collection>
+			<web-resource-name>Staff content</web-resource-name>
+			<url-pattern>/monitoring/*</url-pattern>
+			<url-pattern>/pages/monitoring/*</url-pattern>
+			<url-pattern>/definelater.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>
@@ -295,17 +285,17 @@
 		<description>Group Manager</description>
 		<role-name>GROUP MANAGER</role-name>
 	</security-role>
-	
+
 	<security-role>
 		<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>
@@ -315,5 +305,5 @@
 			<form-error-page>/login.jsp?failed=y</form-error-page>
 		</form-login-config>
 	</login-config>
-   	
- </web-app>
+
+</web-app>