Index: lams_tool_notebook/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_notebook/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_notebook/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?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
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.notebook.web.controller" />
-	
-   	<!-- 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