From 6858c0d799ade820ab3d26b303a907cb0d6caec8 Mon Sep 17 00:00:00 2001
From: Jessie James Cosare <jjcosare@gmail.com>
Date: Fri, 15 Mar 2019 23:09:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
#	src/main/resources/hapi.properties
#	src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
---
 pom.xml                                       |  6 ---
 .../fhir/jpa/starter/FhirServerConfigR4.java  |  1 -
 src/main/webapp/WEB-INF/web.xml               | 48 +------------------
 3 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/pom.xml b/pom.xml
index fb188fc..ca54c6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,12 +111,6 @@
         </dependency>
 
         <!-- Used for CORS support -->
-        <!--<dependency>-->
-            <!--<groupId>org.eclipse.jetty</groupId>-->
-            <!--<artifactId>jetty-servlets</artifactId>-->
-            <!--<version>9.4.12.v20180830</version>-->
-        <!--</dependency>-->
-
         <!-- Spring Web is used to deploy the server to a web container. -->
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java
index e658930..a9957e9 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java
@@ -18,7 +18,6 @@ public class FhirServerConfigR4 extends BaseJavaConfigR4 {
     @Autowired
     private DataSource myDataSource;
 
-
     /**
      * We override the paging provider definition so that we can customize
      * the default/max page sizes for search results. You can set these however
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 6ebba85..6ce88b0 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -31,7 +31,7 @@
 		<init-param>
 			<param-name>contextConfigLocation</param-name>
 			<param-value>
-				ca.uhn.fhir.jpa.starter.FhirTesterConfig,
+				ca.uhn.fhir.jpa.starter.FhirTesterConfig
 			</param-value>
 		</init-param>
 		<load-on-startup>2</load-on-startup>
@@ -51,50 +51,4 @@
 		<url-pattern>/fhir/*</url-pattern>
 	</servlet-mapping>
 
-	<!-- This filters provide support for Cross Origin Resource Sharing (CORS) -->
-	<!--<filter>-->
-		<!--<filter-name>CORS Filter</filter-name>-->
-		<!--<filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>-->
-		<!--<init-param>-->
-			<!--<description>A comma separated list of allowed origins. Note: An '*' cannot be used for an allowed origin when using credentials.</description>-->
-			<!--<param-name>cors.allowed.origins</param-name>-->
-			<!--<param-value>*</param-value>-->
-		<!--</init-param>-->
-		<!--<init-param>-->
-			<!--<description>A comma separated list of HTTP verbs, using which a CORS request can be made.</description>-->
-			<!--<param-name>cors.allowed.methods</param-name>-->
-			<!--<param-value>GET,POST,PUT,DELETE,OPTIONS</param-value>-->
-		<!--</init-param>-->
-		<!--<init-param>-->
-			<!--<description>A comma separated list of allowed headers when making a non simple CORS request.</description>-->
-			<!--<param-name>cors.allowed.headers</param-name>-->
-			<!--<param-value>Accept,Access-Control-Request-Headers,Access-Control-Request-Method,Cache-Control,Content-Type,Origin,Prefer,X-FHIR-Starter,X-Requested-With</param-value>-->
-		<!--</init-param>-->
-		<!--<init-param>-->
-			<!--<description>A comma separated list non-standard response headers that will be exposed to XHR2 object.</description>-->
-			<!--<param-name>cors.exposed.headers</param-name>-->
-			<!--<param-value>Location,Content-Location</param-value>-->
-		<!--</init-param>-->
-		<!--<init-param>-->
-			<!--<description>A flag that suggests if CORS is supported with cookies</description>-->
-			<!--<param-name>cors.support.credentials</param-name>-->
-			<!--<param-value>true</param-value>-->
-		<!--</init-param>-->
-		<!--<init-param>-->
-			<!--<description>A flag to control logging</description>-->
-			<!--<param-name>cors.logging.enabled</param-name>-->
-			<!--<param-value>true</param-value>-->
-		<!--</init-param>-->
-		<!--<init-param>-->
-			<!--<description>Indicates how long (in seconds) the results of a preflight request can be cached in a preflight result cache.</description>-->
-			<!--<param-name>cors.preflight.maxage</param-name>-->
-			<!--<param-value>300</param-value>-->
-		<!--</init-param>-->
-	<!--</filter>-->
-	<!--<filter-mapping>-->
-		<!--<filter-name>CORS Filter</filter-name>-->
-		<!--<url-pattern>/*</url-pattern>-->
-	<!--</filter-mapping>-->
-
-
 </web-app>