Index: lams_tool_gmap/web/WEB-INF/web.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45
--- lams_tool_gmap/web/WEB-INF/web.xml	(.../web.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_gmap/web/WEB-INF/web.xml	(.../web.xml)	(revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45)
@@ -3,16 +3,12 @@
 <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">
-	<context-param>
-		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-		<param-value>org.lamsfoundation.lams.tool.gmap.ApplicationResources</param-value>
-	</context-param>
+	<display-name>Gmap</display-name>
+	<description>
+		Gmap tool
+	</description>
 
 	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>classpath:/org/lamsfoundation/lams/tool/gmap/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>
@@ -21,300 +17,45 @@
 		<param-value>context.central</param-value>
 	</context-param>
 
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>
+
 	<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.springframework.orm.hibernate5.support.OpenSessionInViewFilter
-		</filter-class>
-		<init-param>
-			<param-name>sessionFactoryBeanName</param-name>
-			<param-value>coreSessionFactory</param-value>
-		</init-param>
-	</filter>
-	<filter>
-		<filter-name>LocaleFilter</filter-name>
-		<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>LocaleFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
 
-	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</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-name>spring</servlet-name>
+		<servlet-class>
+			org.springframework.web.servlet.DispatcherServlet
+		</servlet-class>
+				<load-on-startup>1</load-on-startup>
 	</servlet>
 
-	<!-- FCKEditor Connector Configuration -->
-
-	<servlet>
-		<servlet-name>Connector</servlet-name>
-		<servlet-class>net.fckeditor.connector.ConnectorServlet</servlet-class>
-		<init-param>
-			<param-name>baseDir</param-name>
-			<param-value>/UserFiles/</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>false</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<!-- The download servlet, reused from the content repository jar -->
-	<servlet>
-		<description>Attachment Download</description>
-		<display-name>Attachment Download</display-name>
-		<servlet-name>download</servlet-name>
-		<servlet-class>org.lamsfoundation.lams.contentrepository.client.ToolDownload</servlet-class>
-		<init-param>
-			<param-name>toolContentHandlerBeanName</param-name>
-			<param-value>gmapToolContentHandler</param-value>
-		</init-param>
-		<load-on-startup>3</load-on-startup>
-	</servlet>
-
 	<servlet-mapping>
-		<servlet-name>action</servlet-name>
+		<servlet-name>spring</servlet-name>
 		<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
-	<!-- FCKEditor Connector Configuration -->
-	<servlet-mapping>
-		<servlet-name>Connector</servlet-name>
-		<url-pattern>/ckeditor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>download</servlet-name>
-		<url-pattern>/download/*</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>
-
-	<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>
-		<taglib>
-			<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>
-		<taglib>
-			<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>
-		<taglib>
-			<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>
-		<taglib>
-			<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>
-		</taglib>
-
-	</jsp-config>
-
-	<!-- Security Constraint -->
 	<deny-uncovered-http-methods />
 	
 	<security-constraint>
 		<web-resource-collection>
-			<web-resource-name>Secure Content</web-resource-name>
+			<web-resource-name>Public content</web-resource-name>
 			<url-pattern>/*</url-pattern>
 			<http-method>GET</http-method>
  			<http-method>POST</http-method>
 		</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>/pages/authoring/*</url-pattern>
-			<url-pattern>/authoring.do</url-pattern>
-			<http-method>GET</http-method>
- 			<http-method>POST</http-method>
-		</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>/pages/monitoring/*</url-pattern>
-			<url-pattern>/monitoring.do</url-pattern>
-			<http-method>GET</http-method>
- 			<http-method>POST</http-method>
-		</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>Admin content</web-resource-name>
-			<url-pattern>/pages/admin/*</url-pattern>
-			<url-pattern>/lagmap10admin.do</url-pattern>
-			<http-method>GET</http-method>
- 			<http-method>POST</http-method>
-		</web-resource-collection>
-		<auth-constraint>
-			<role-name>SYSADMIN</role-name>
-		</auth-constraint>
-	</security-constraint>
-
-	<!-- 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>
-	
-	<!-- Security Roles -->
-	<security-role>
-		<description>Student</description>
-		<role-name>LEARNER</role-name>
-	</security-role>
-
-	<security-role>
-		<description>Authors Learning Designs</description>
-		<role-name>AUTHOR</role-name>
-	</security-role>
-
-	<security-role>
-		<description>Member of Staff</description>
-		<role-name>MONITOR</role-name>
-	</security-role>
-
-	<security-role>
-		<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>
 </web-app>
\ No newline at end of file