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