Improve multiversion support

src/main/webapp/WEB-INF/web.xml

@@ -5,6 +5,7 @@
 		metadata-complete="false"
 		version="3.1">
 
+	<!--
 	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
@@ -17,12 +18,12 @@
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
-			ca.uhn.fhir.jpa.demo.FhirServerConfig
+			ca.uhn.fhir.jpa.starter.FhirServerConfig
 		</param-value>
 	</context-param>
+	-->
 
 	<!-- Servlets -->
-
 	<servlet>
 		<servlet-name>spring</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
@@ -32,28 +33,20 @@
 		</init-param>
 		<init-param>
 			<param-name>contextConfigLocation</param-name>
-			<param-value>ca.uhn.fhir.jpa.demo.FhirTesterConfig</param-value>
+			<param-value>ca.uhn.fhir.jpa.starter.FhirTesterConfig</param-value>
 		</init-param>
 		<load-on-startup>2</load-on-startup>
 	</servlet>
 
 	<servlet>
 		<servlet-name>fhirServlet</servlet-name>
-		<servlet-class>ca.uhn.fhir.jpa.demo.JpaServerDemo</servlet-class>
-		<init-param>
-			<param-name>ImplementationDescription</param-name>
-			<param-value>FHIR JPA Server</param-value>
-		</init-param>
-		<init-param>
-			<param-name>FhirVersion</param-name>
-			<param-value>DSTU3</param-value>
-		</init-param>
+		<servlet-class>ca.uhn.fhir.jpa.starter.JpaRestfulServer</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 
 	<servlet-mapping>
 		<servlet-name>fhirServlet</servlet-name>
-		<url-pattern>/baseDstu3/*</url-pattern>
+		<url-pattern>/fhir/*</url-pattern>
 	</servlet-mapping>
 
 	<servlet-mapping>