Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r08f3df3d44b8a16fbaabfdec7079667d02bbbd1a -r191a7d2638423869208e4783438aad7750423bdc
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 08f3df3d44b8a16fbaabfdec7079667d02bbbd1a)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 191a7d2638423869208e4783438aad7750423bdc)
@@ -47,25 +47,22 @@
 		<filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter
 		</filter-class>
 	</filter>
-
 	<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
+			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>
@@ -78,97 +75,79 @@
 		<url-pattern>/signup/*</url-pattern>
 		<dispatcher>REQUEST</dispatcher>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>SystemSessionFilter</filter-name>
 		<url-pattern>*.do</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>SystemSessionFilter</filter-name>
 		<url-pattern>*.jsp</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>SystemSessionFilter</filter-name>
 		<url-pattern>*.xml</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>SystemSessionFilter</filter-name>
 		<url-pattern>/servlet/*</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>SystemSessionFilter</filter-name>
 		<url-pattern>/ckeditor/*</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>hibernateFilter</filter-name>
 		<url-pattern>*.do</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>hibernateFilter</filter-name>
 		<url-pattern>*.jsp</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>hibernateFilter</filter-name>
 		<url-pattern>*.xml</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>hibernateFilter</filter-name>
 		<url-pattern>/servlet/*</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>hibernateFilter</filter-name>
 		<url-pattern>/services/*</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>hibernateFilter</filter-name>
 		<url-pattern>/ckeditor/*</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>hibernateFilter</filter-name>
 		<url-pattern>/LoginRequest</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>hibernateFilter</filter-name>
 		<url-pattern>/ForgotPasswordRequest</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>LocaleFilter</filter-name>
 		<url-pattern>*.do</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>LocaleFilter</filter-name>
 		<url-pattern>*.jsp</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>LocaleFilter</filter-name>
 		<url-pattern>*.xml</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>LocaleFilter</filter-name>
 		<url-pattern>/servlet/*</url-pattern>
 	</filter-mapping>
-
 	<filter-mapping>
 		<filter-name>LocaleFilter</filter-name>
 		<url-pattern>/ckeditor/*</url-pattern>
 	</filter-mapping>
-
+	
 	<listener>
 		<listener-class>
 			org.springframework.web.context.ContextLoaderListener
@@ -206,7 +185,7 @@
 
 	<servlet>
 		<servlet-name>RegisterServlet</servlet-name>
-		<servlet-class>org.lamsfoundation.lams.webservice.RegisterAction
+		<servlet-class>org.lamsfoundation.lams.webservice.RegisterServlet
 		</servlet-class>
 	</servlet>
 
@@ -256,26 +235,10 @@
 	</servlet>
 	
 	<servlet>
-		<servlet-name>action</servlet-name>
+		<servlet-name>spring</servlet-name>
 		<servlet-class>
-			org.apache.struts.action.ActionServlet
+			org.springframework.web.servlet.DispatcherServlet
 		</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>
 
@@ -417,7 +380,7 @@
 	<!-- Optional Module Placeholder - do not remove -->
 
 	<servlet-mapping>
-		<servlet-name>action</servlet-name>
+		<servlet-name>spring</servlet-name>
 		<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
@@ -560,49 +523,6 @@
 	<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>
@@ -658,7 +578,6 @@
 			<role-name>MONITOR</role-name>
 			<role-name>AUTHOR</role-name>
 			<role-name>GROUP MANAGER</role-name>
-			<role-name>GROUP ADMIN</role-name>
 			<role-name>SYSADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
@@ -726,7 +645,6 @@
 			<role-name>AUTHOR</role-name>
 			<role-name>MONITOR</role-name>
 			<role-name>GROUP MANAGER</role-name>
-			<role-name>GROUP ADMIN</role-name>
 			<role-name>SYSADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
@@ -788,10 +706,6 @@
 		<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>