diff --git a/.gitignore b/.gitignore index 18c430d..2615967 100644 --- a/.gitignore +++ b/.gitignore @@ -87,6 +87,10 @@ local.properties .loadpath .recommenders +### Additional Eclipse files +.classpath +.project + # External tool builders .externalToolBuilders/ @@ -157,4 +161,7 @@ Icon .AppleDesktop Network Trash Folder Temporary Items -.apdisk \ No newline at end of file +.apdisk + +# settings.xml copied from local dev workflow for tiny-maven-proxy +settings.xml \ No newline at end of file diff --git a/docker-build.bat b/docker-build.bat index fab0cec..2022746 100644 --- a/docker-build.bat +++ b/docker-build.bat @@ -1 +1 @@ -docker build --tag hapiproject/hapi:latest --tag hapiproject/hapi:4.1 -m 4g . \ No newline at end of file +docker build --tag uwcirg/hapi-fhir-oauth2-starter:latest -m 4g . \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3ad764d..1a3265b 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,8 @@ 4.2.0 - hapi-fhir-jpaserver-starter + edu.washington.cirg + hapi-fhir-oauth2-starter 3.5.0 @@ -254,7 +255,7 @@ war - HAPI FHIR JPA Server - Starter Project + UW CIRG HAPI FHIR JPA Server @@ -300,6 +301,7 @@ org.apache.maven.plugins maven-war-plugin + true ${maven.build.timestamp} diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/ApplicationContext.java b/src/main/java/edu/washington/cirg/fhir/jpa/starter/ApplicationContext.java similarity index 95% rename from src/main/java/ca/uhn/fhir/jpa/starter/ApplicationContext.java rename to src/main/java/edu/washington/cirg/fhir/jpa/starter/ApplicationContext.java index 24b4f79..be04498 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/ApplicationContext.java +++ b/src/main/java/edu/washington/cirg/fhir/jpa/starter/ApplicationContext.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.starter; +package edu.washington.cirg.fhir.jpa.starter; import ca.uhn.fhir.context.FhirVersionEnum; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java b/src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirServerConfigCommon.java similarity index 99% rename from src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java rename to src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirServerConfigCommon.java index 37f5589..58d7a9f 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java +++ b/src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirServerConfigCommon.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.starter; +package edu.washington.cirg.fhir.jpa.starter; import ca.uhn.fhir.jpa.binstore.DatabaseBlobBinaryStorageSvcImpl; import ca.uhn.fhir.jpa.binstore.IBinaryStorageSvc; @@ -51,7 +51,7 @@ public class FhirServerConfigCommon { private Boolean emailStartTlsRequired = HapiProperties.getEmailStartTlsRequired(); private Boolean emailQuitWait = HapiProperties.getEmailQuitWait(); - @Autowired + @Autowired(required=false) private SubscriptionDeliveryHandlerFactory mySubscriptionDeliveryHandlerFactory; public FhirServerConfigCommon() { diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu2.java b/src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirServerConfigDstu2.java similarity index 97% rename from src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu2.java rename to src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirServerConfigDstu2.java index dc91099..e40b336 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu2.java +++ b/src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirServerConfigDstu2.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.starter; +package edu.washington.cirg.fhir.jpa.starter; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.jpa.config.BaseJavaConfigDstu2; diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu3.java b/src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirServerConfigDstu3.java similarity index 97% rename from src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu3.java rename to src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirServerConfigDstu3.java index 3344952..e8ca719 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu3.java +++ b/src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirServerConfigDstu3.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.starter; +package edu.washington.cirg.fhir.jpa.starter; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.jpa.config.BaseJavaConfigDstu3; diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java b/src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirServerConfigR4.java similarity index 97% rename from src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java rename to src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirServerConfigR4.java index 77a798e..4dde3ed 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java +++ b/src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirServerConfigR4.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.starter; +package edu.washington.cirg.fhir.jpa.starter; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.jpa.config.BaseJavaConfigR4; diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR5.java b/src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirServerConfigR5.java similarity index 97% rename from src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR5.java rename to src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirServerConfigR5.java index 6d9e45b..3a28cd9 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR5.java +++ b/src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirServerConfigR5.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.starter; +package edu.washington.cirg.fhir.jpa.starter; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.jpa.config.BaseJavaConfigR5; diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirTesterConfig.java b/src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirTesterConfig.java similarity index 97% rename from src/main/java/ca/uhn/fhir/jpa/starter/FhirTesterConfig.java rename to src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirTesterConfig.java index 11ccbcb..1d72a87 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirTesterConfig.java +++ b/src/main/java/edu/washington/cirg/fhir/jpa/starter/FhirTesterConfig.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.starter; +package edu.washington.cirg.fhir.jpa.starter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java b/src/main/java/edu/washington/cirg/fhir/jpa/starter/HapiProperties.java similarity index 99% rename from src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java rename to src/main/java/edu/washington/cirg/fhir/jpa/starter/HapiProperties.java index 5be55f4..663b8f8 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java +++ b/src/main/java/edu/washington/cirg/fhir/jpa/starter/HapiProperties.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.starter; +package edu.washington.cirg.fhir.jpa.starter; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java b/src/main/java/edu/washington/cirg/fhir/jpa/starter/JpaRestfulServer.java similarity index 99% rename from src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java rename to src/main/java/edu/washington/cirg/fhir/jpa/starter/JpaRestfulServer.java index f5a47f6..1b2cec6 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java +++ b/src/main/java/edu/washington/cirg/fhir/jpa/starter/JpaRestfulServer.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.starter; +package edu.washington.cirg.fhir.jpa.starter; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirVersionEnum; diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java b/src/test/java/edu/washington/cirg/fhir/jpa/starter/ExampleServerDstu2IT.java similarity index 96% rename from src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java rename to src/test/java/edu/washington/cirg/fhir/jpa/starter/ExampleServerDstu2IT.java index ee6ebf8..a2b74c9 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java +++ b/src/test/java/edu/washington/cirg/fhir/jpa/starter/ExampleServerDstu2IT.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.starter; +package edu.washington.cirg.fhir.jpa.starter; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.dstu2.resource.Patient; @@ -6,6 +6,8 @@ import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum; import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor; import ca.uhn.fhir.test.utilities.JettyUtil; +import edu.washington.cirg.fhir.jpa.starter.HapiProperties; + import org.eclipse.jetty.server.Server; import org.eclipse.jetty.webapp.WebAppContext; import org.hl7.fhir.instance.model.api.IIdType; diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java b/src/test/java/edu/washington/cirg/fhir/jpa/starter/ExampleServerDstu3IT.java similarity index 98% rename from src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java rename to src/test/java/edu/washington/cirg/fhir/jpa/starter/ExampleServerDstu3IT.java index f1c2617..6654002 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java +++ b/src/test/java/edu/washington/cirg/fhir/jpa/starter/ExampleServerDstu3IT.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.starter; +package edu.washington.cirg.fhir.jpa.starter; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.CacheControlDirective; @@ -8,6 +8,8 @@ import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum; import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor; import ca.uhn.fhir.test.utilities.JettyUtil; +import edu.washington.cirg.fhir.jpa.starter.HapiProperties; + import org.eclipse.jetty.server.Server; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.websocket.api.Session; diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java b/src/test/java/edu/washington/cirg/fhir/jpa/starter/ExampleServerR4IT.java similarity index 98% rename from src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java rename to src/test/java/edu/washington/cirg/fhir/jpa/starter/ExampleServerR4IT.java index 1eedafd..8f4ecb7 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java +++ b/src/test/java/edu/washington/cirg/fhir/jpa/starter/ExampleServerR4IT.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.starter; +package edu.washington.cirg.fhir.jpa.starter; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.CacheControlDirective; @@ -8,6 +8,8 @@ import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum; import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor; import ca.uhn.fhir.test.utilities.JettyUtil; +import edu.washington.cirg.fhir.jpa.starter.HapiProperties; + import org.eclipse.jetty.server.Server; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.websocket.api.Session; diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java b/src/test/java/edu/washington/cirg/fhir/jpa/starter/ExampleServerR5IT.java similarity index 98% rename from src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java rename to src/test/java/edu/washington/cirg/fhir/jpa/starter/ExampleServerR5IT.java index 80f7a20..09007b3 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java +++ b/src/test/java/edu/washington/cirg/fhir/jpa/starter/ExampleServerR5IT.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.jpa.starter; +package edu.washington.cirg.fhir.jpa.starter; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.rest.api.CacheControlDirective; @@ -8,6 +8,8 @@ import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum; import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor; import ca.uhn.fhir.test.utilities.JettyUtil; +import edu.washington.cirg.fhir.jpa.starter.HapiProperties; + import org.eclipse.jetty.server.Server; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.websocket.api.Session; diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/RandomServerPortProvider.java b/src/test/java/edu/washington/cirg/fhir/jpa/starter/RandomServerPortProvider.java similarity index 90% rename from src/test/java/ca/uhn/fhir/jpa/starter/RandomServerPortProvider.java rename to src/test/java/edu/washington/cirg/fhir/jpa/starter/RandomServerPortProvider.java index 65446f0..c40cd2f 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/RandomServerPortProvider.java +++ b/src/test/java/edu/washington/cirg/fhir/jpa/starter/RandomServerPortProvider.java @@ -1,36 +1,36 @@ -package ca.uhn.fhir.jpa.starter; - -import java.io.IOException; -import java.net.ServerSocket; -import java.util.ArrayList; -import java.util.List; - -/** - * Provides server ports - */ -public class RandomServerPortProvider { - - private static List ourPorts = new ArrayList(); - - public static int findFreePort() { - ServerSocket server; - try { - server = new ServerSocket(0); - int port = server.getLocalPort(); - ourPorts.add(port); - server.close(); - Thread.sleep(500); - return port; - } catch (IOException e) { - throw new Error(e); - } catch (InterruptedException e) { - throw new Error(e); - } - } - - public static List list() { - return ourPorts; - } - -} +package edu.washington.cirg.fhir.jpa.starter; + +import java.io.IOException; +import java.net.ServerSocket; +import java.util.ArrayList; +import java.util.List; + +/** + * Provides server ports + */ +public class RandomServerPortProvider { + + private static List ourPorts = new ArrayList(); + + public static int findFreePort() { + ServerSocket server; + try { + server = new ServerSocket(0); + int port = server.getLocalPort(); + ourPorts.add(port); + server.close(); + Thread.sleep(500); + return port; + } catch (IOException e) { + throw new Error(e); + } catch (InterruptedException e) { + throw new Error(e); + } + } + + public static List list() { + return ourPorts; + } + +} \ No newline at end of file diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/SocketImplementation.java b/src/test/java/edu/washington/cirg/fhir/jpa/starter/SocketImplementation.java similarity index 98% rename from src/test/java/ca/uhn/fhir/jpa/starter/SocketImplementation.java rename to src/test/java/edu/washington/cirg/fhir/jpa/starter/SocketImplementation.java index 9318a0a..aeb8ec9 100644 --- a/src/test/java/ca/uhn/fhir/jpa/starter/SocketImplementation.java +++ b/src/test/java/edu/washington/cirg/fhir/jpa/starter/SocketImplementation.java @@ -1,5 +1,5 @@ -package ca.uhn.fhir.jpa.starter; +package edu.washington.cirg.fhir.jpa.starter; import ca.uhn.fhir.rest.api.EncodingEnum; import org.eclipse.jetty.websocket.api.Session;