Merge branch 'master' into more_properties

src/main/resources/hapi.properties

@@ -8,10 +8,16 @@ fhir_version=DSTU3
 # server, put the DNS name of that server here.
 server_address=http://localhost/fhir/
 
+# For Jetty, use this:
+# server_address=http://localhost:8080/hapi-fhir-jpaserver/fhir/
+
 # This is the context path for the FHIR endpoint. If this is changed, the
 # setting above should also be changed.
 server.base=/fhir
 
+# For Jetty, use this:
+# server.base=/hapi-fhir-jpaserver/fhir
+
 default_encoding=JSON
 etag_support=ENABLED
 default_page_size=20
@@ -34,14 +40,6 @@ datasource.password=
 server.name=Local Tester
 server.id=home
 test.port=
-subscription.email.enabled=true
-email.enabled=false
-email.from=some@test.com
-email.host=
-email.port=0
-email.username=
-email.password=
-subscription.resthook.enabled=true
 hibernate.dialect=ca.uhn.fhir.jpa.util.DerbyTenSevenHapiFhirDialect
 hibernate.search.model_mapping=ca.uhn.fhir.jpa.search.LuceneSearchMappingFactory
 hibernate.format_sql=false
@@ -54,4 +52,23 @@ hibernate.cache.use_structured_entries=false
 hibernate.cache.use_minimal_puts=false
 hibernate.search.default.directory_provider=filesystem
 hibernate.search.default.indexBase=target/lucenefiles
-hibernate.search.lucene_version=LUCENE_CURRENT
+hibernate.search.lucene_version=LUCENE_CURRENT
+
+##################################################
+# Subscriptions
+##################################################
+
+# Enable REST Hook Subscription Channel
+subscription.resthook.enabled=false
+
+# Enable Email Subscription Channel
+subscription.email.enabled=false
+email.enabled=false
+email.from=some@test.com
+email.host=
+email.port=0
+email.username=
+email.password=
+
+# Enable Websocket Subscription Channel
+subscription.websocket.enabled=false