Index: lams_admin/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_admin/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.admin.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_central/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -reea74e19cb042a1a423e3eb9eedf96e54c5e4319 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_central/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision eea74e19cb042a1a423e3eb9eedf96e54c5e4319)
+++ lams_central/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
            				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
            				   http://www.springframework.org/schema/context 
    						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 	<!-- Spring MVC -->
-	<context:component-scan base-package="org.lamsfoundation.lams.web, org.lamsfoundation.lams.authoring, 
+	<context:component-scan
+		base-package="org.lamsfoundation.lams.web, org.lamsfoundation.lams.authoring, 
 		org.lamsfoundation.lams.workspace.web, org.lamsfoundation.lams.comments.web" />
-	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r92525f17be9db4e57a8551ff92d004f319fb4b73 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 92525f17be9db4e57a8551ff92d004f319fb4b73)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -9,7 +9,40 @@
 
 	<import resource="messageContext.xml"/>
 
+	<!-- ========================= SPRING MVC GLOBAL BEANS ========================= -->
+	
+	<!-- This bean is used by DefaultAnnotationHandlerMapping bean in each LAMS module -->
+	<bean
+		class="org.lamsfoundation.lams.context.AnnotationMethodHandlerAdapter">
+		<property name="webBindingInitializer">
+			<bean
+				class="org.springframework.web.bind.support.ConfigurableWebBindingInitializer">
+			</bean>
+		</property>
+		<property name="messageConverters">
+			<list>
+				<bean
+					class="org.springframework.http.converter.ByteArrayHttpMessageConverter" />
+				<bean
+					class="org.springframework.http.converter.StringHttpMessageConverter" />
+				<bean
+					class="org.springframework.http.converter.FormHttpMessageConverter" />
+				<bean
+					class="org.springframework.http.converter.xml.SourceHttpMessageConverter" />
+			</list>
+		</property>
+	</bean>
+
+	<!-- This bean is used by MVC mechanism in each LAMS module -->
+	<bean
+		class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+		<property name="prefix" value="/" />
+		<property name="suffix" value=".jsp" />
+	</bean>
+	
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
+	
+	
 
  	<!-- Hibernate SessionFactory. Since LAMS 2.3 it is used in all tools and other parts of LAMS,
  		 rather than several local Session Factories.
Index: lams_gradebook/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_gradebook/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_gradebook/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.gradebook.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r4f526e3455fe0ed91e6a838c833f1cd916844b98 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_learning/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 4f526e3455fe0ed91e6a838c833f1cd916844b98)
+++ lams_learning/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -12,8 +12,8 @@
 	<context:component-scan base-package="org.lamsfoundation.lams.learning.discussion.controller" />
 	<context:component-scan base-package="org.lamsfoundation.lams.learning.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r6e7ab7890111cde84e6557c3507a1e9d3682e318 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_monitoring/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 6e7ab7890111cde84e6557c3507a1e9d3682e318)
+++ lams_monitoring/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.monitoring.web" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_assessment/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
            				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
            				   http://www.springframework.org/schema/context 
    						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
-	<context:component-scan base-package="org.lamsfoundation.lams.tool.assessment.web.controller" />
-	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   						   
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
+		
+	<context:component-scan
+		base-package="org.lamsfoundation.lams.tool.assessment.web.controller" />
 </beans>
\ No newline at end of file
Index: lams_tool_bbb/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_bbb/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45)
+++ lams_tool_bbb/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.bbb.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_chat/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.chat.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r085d47fc4191f2cb614a5a7c8fe3ff6c5abcef0f -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_daco/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 085d47fc4191f2cb614a5a7c8fe3ff6c5abcef0f)
+++ lams_tool_daco/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.daco.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_dimdim/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r05ca07ef40c870800a42b5f700f667509cde1993 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_dimdim/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 05ca07ef40c870800a42b5f700f667509cde1993)
+++ lams_tool_dimdim/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.dimdim.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r1cef918442124e8d987a285095a7504e3bc00461 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_doku/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 1cef918442124e8d987a285095a7504e3bc00461)
+++ lams_tool_doku/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.dokumaran.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_eadventure/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r05ca07ef40c870800a42b5f700f667509cde1993 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_eadventure/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 05ca07ef40c870800a42b5f700f667509cde1993)
+++ lams_tool_eadventure/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.eucm.lams.tool.eadventure.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_forum/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.forum.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r910f7a30fc4dc1b47e8b3e2df5927c64df977a45 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_gmap/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 910f7a30fc4dc1b47e8b3e2df5927c64df977a45)
+++ lams_tool_gmap/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.gmap.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r9c66807dec11ccfe2299008ded08091f487a3478 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_images/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 9c66807dec11ccfe2299008ded08091f487a3478)
+++ lams_tool_images/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.imageGallery.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_imscc/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.commonCartridge.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -rff911101cbe92d6813691c20c292fa04519820b4 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_kaltura/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
+++ lams_tool_kaltura/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.kaltura.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_lamc/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d)
+++ lams_tool_lamc/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.mc.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_laqa/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.qa.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_larsrc/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.rsrc.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_leader/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.leaderselection.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_mindmap/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.mindmap.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_nb/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.noticeboard.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_notebook/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.notebook.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_pixlr/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_pixlr/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.pixlr.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_preview/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
+++ lams_tool_preview/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.peerreview.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_sbmt/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.sbmt.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r22cca1a815f7aee530e14ab87b7744f381d03ac1 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_scratchie/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 22cca1a815f7aee530e14ab87b7744f381d03ac1)
+++ lams_tool_scratchie/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.scratchie.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -rb7b682644cd1d20e061092b1411eeb679a1f9fb2 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_scribe/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision b7b682644cd1d20e061092b1411eeb679a1f9fb2)
+++ lams_tool_scribe/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
            				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
            				   http://www.springframework.org/schema/context 
    						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
+		
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.scribe.web.controller" />
-	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
 </beans>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_spreadsheet/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
+++ lams_tool_spreadsheet/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -7,11 +7,10 @@
            				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
            				   http://www.springframework.org/schema/context 
    						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.spreadsheet.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_survey/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -7,11 +7,12 @@
            				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
            				   http://www.springframework.org/schema/context 
    						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.survey.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   						   
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_task/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.taskList.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_videorecorder/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r2d2c869032858b474398c651f8c45371410ba0d2 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_videorecorder/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 2d2c869032858b474398c651f8c45371410ba0d2)
+++ lams_tool_videorecorder/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.videoRecorder.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r6b5a9c4363061334be8adbfc81ffffc3e8b63b0b -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_vote/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 6b5a9c4363061334be8adbfc81ffffc3e8b63b0b)
+++ lams_tool_vote/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.vote.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r90e5fd15f6474eb56d0b497d1b73e14bda75e262 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_whiteboard/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 90e5fd15f6474eb56d0b497d1b73e14bda75e262)
+++ lams_tool_whiteboard/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.whiteboard.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r6c3d39685a1c47ef53b41a1eb29818b6f23f85cc -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_wiki/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 6c3d39685a1c47ef53b41a1eb29818b6f23f85cc)
+++ lams_tool_wiki/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.wiki.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_wookie/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -rec39d1ee6a4b7b3a709058eb39777c872e1b5c97 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_wookie/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision ec39d1ee6a4b7b3a709058eb39777c872e1b5c97)
+++ lams_tool_wookie/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.wookie.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -rcd28f26327e5afe5f9797847d801eba0abab9144 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_zoom/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision cd28f26327e5afe5f9797847d801eba0abab9144)
+++ lams_tool_zoom/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -10,8 +10,8 @@
 	<!-- Spring MVC -->
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.zoom.web.controller" />
 	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file