Merge branch 'rel_4_0_0'

src/main/resources/hapi.properties

@@ -22,6 +22,7 @@ allow_override_default_search_params=true
 allow_contains_searches=true
 allow_multiple_delete=true
 allow_external_references=true
+allow_cascading_deletes=true
 allow_placeholder_references=true
 expunge_enabled=true
 persistence_unit_name=HAPI_PU
@@ -29,14 +30,40 @@ logger.name=fhirtest.access
 logger.format=Path[${servletPath}] Source[${requestHeader.x-forwarded-for}] Operation[${operationType} ${operationName} ${idOrResourceName}] UA[${requestHeader.user-agent}] Params[${requestParameters}] ResponseEncoding[${responseEncodingNoDefault}]
 logger.error_format=ERROR - ${requestVerb} ${requestUrl}
 logger.log_exceptions=true
-datasource.driver=org.apache.derby.jdbc.EmbeddedDriver
-datasource.url=jdbc:derby:directory:target/jpaserver_derby_files;create=true
+datasource.driver=org.h2.Driver
+datasource.url=jdbc:h2:file:./target/database/h2
 datasource.username=
 datasource.password=
 server.name=Local Tester
 server.id=home
 test.port=
-hibernate.dialect=ca.uhn.fhir.jpa.util.DerbyTenSevenHapiFhirDialect
+
+###################################################
+# Validation
+###################################################
+# Should all incoming requests be validated
+validation.requests.enabled=false
+# Should outgoing responses be validated
+validation.responses.enabled=false
+
+###################################################
+# Search Features
+###################################################
+filter_search.enabled=true
+graphql.enabled=true
+
+###################################################
+# Supported Resources
+###################################################
+# Enable the following property if you want to customize the
+# list of resources that is supported by the server (i.e. to
+# disable specific resources)
+#supported_resource_types=Patient,Observation,Encounter
+
+###################################################
+# Database Settings
+###################################################
+hibernate.dialect=org.hibernate.dialect.H2Dialect
 hibernate.search.model_mapping=ca.uhn.fhir.jpa.search.LuceneSearchMappingFactory
 hibernate.format_sql=false
 hibernate.show_sql=false
@@ -50,6 +77,15 @@ hibernate.search.default.directory_provider=filesystem
 hibernate.search.default.indexBase=target/lucenefiles
 hibernate.search.lucene_version=LUCENE_CURRENT
 tester.config.refuse_to_fetch_third_party_urls=false
+
+##################################################
+# Binary Storage Operations
+##################################################
+binary_storage.enabled=true
+
+##################################################
+# CORS Settings
+##################################################
 cors.enabled=true
 cors.allowCredentials=true
 # Supports multiple, comma separated allowed origin entries