Add support for websockets

src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu2.java

@@ -35,7 +35,7 @@ public class FhirServerConfigDstu2 extends BaseJavaConfigDstu2 {
     @Bean()
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         LocalContainerEntityManagerFactoryBean retVal = super.entityManagerFactory();
-        retVal.setPersistenceUnitName(HapiProperties.getPersistenceUnitName());
+        retVal.setPersistenceUnitName("HAPI_PU");
 
         try {
             retVal.setDataSource(myDataSource);

src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu3.java

@@ -35,7 +35,7 @@ public class FhirServerConfigDstu3 extends BaseJavaConfigDstu3 {
     @Bean()
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         LocalContainerEntityManagerFactoryBean retVal = super.entityManagerFactory();
-        retVal.setPersistenceUnitName(HapiProperties.getPersistenceUnitName());
+        retVal.setPersistenceUnitName("HAPI_PU");
 
         try {
             retVal.setDataSource(myDataSource);

src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java

@@ -35,7 +35,7 @@ public class FhirServerConfigR4 extends BaseJavaConfigR4 {
     @Bean()
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         LocalContainerEntityManagerFactoryBean retVal = super.entityManagerFactory();
-        retVal.setPersistenceUnitName(HapiProperties.getPersistenceUnitName());
+        retVal.setPersistenceUnitName("HAPI_PU");
 
         try {
             retVal.setDataSource(myDataSource);

src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java

@@ -32,9 +32,7 @@ public class HapiProperties {
     static final String LOGGER_NAME = "logger.name";
     static final String MAX_FETCH_SIZE = "max_fetch_size";
     static final String MAX_PAGE_SIZE = "max_page_size";
-    static final String PERSISTENCE_UNIT_NAME = "persistence_unit_name";
     static final String SERVER_ADDRESS = "server_address";
-    static final String SERVER_BASE = "server.base";
     static final String SERVER_ID = "server.id";
     static final String SERVER_NAME = "server.name";
     static final String SUBSCRIPTION_EMAIL_ENABLED = "subscription.email.enabled";
@@ -201,10 +199,6 @@ public class HapiProperties {
         return HapiProperties.getIntegerProperty(MAX_FETCH_SIZE, Integer.MAX_VALUE);
     }
 
-    public static String getPersistenceUnitName() {
-        return HapiProperties.getProperty(PERSISTENCE_UNIT_NAME, "HAPI_PU");
-    }
-
     public static String getLoggerName() {
         return HapiProperties.getProperty(LOGGER_NAME, "fhirtest.access");
     }
@@ -269,10 +263,6 @@ public class HapiProperties {
         return HapiProperties.getProperty(CORS_ALLOWED_ORIGIN, "*");
     }
 
-    public static String getServerBase() {
-        return HapiProperties.getProperty(SERVER_BASE, "/fhir");
-    }
-
     public static String getServerName() {
         return HapiProperties.getProperty(SERVER_NAME, "Local Tester");
     }

src/main/resources/hapi.properties

@@ -6,11 +6,12 @@ fhir_version=DSTU3
 # This is the address that the FHIR server will report as its own address.
 # If this server will be deployed (for example) to an internet accessible
 # server, put the DNS name of that server here.
-server_address=http://localhost:8080/fhir/
-
-# This is the context path for the FHIR endpoint. If this is changed, the
-# setting above should also be changed.
-server.base=/fhir
+#
+# Note that this is also the address that the hapi-fhir-testpage-overlay
+# (the web UI similar to the one at http://hapi.fhir.org) will use to
+# connect internally to the FHIR server, so this also needs to be a name
+# accessible from the server itself.
+server_address=http://localhost:8080/hapi-fhir-jpaserver/fhir/
 
 default_encoding=JSON
 etag_support=ENABLED