changing package namespace to edu.washington.cirg.*, updating pom to …

…publish classes jar to local maven repo, changing docker-build.bat to tag image with uwcirg image name

.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
+.apdisk
+
+# settings.xml copied from local dev workflow for tiny-maven-proxy
+settings.xml

docker-build.bat

@@ -1 +1 @@
-docker build --tag hapiproject/hapi:latest --tag hapiproject/hapi:4.1 -m 4g .
+docker build --tag uwcirg/hapi-fhir-oauth2-starter:latest -m 4g .

pom.xml

@@ -14,7 +14,8 @@
         <version>4.2.0</version>
     </parent>
 
-    <artifactId>hapi-fhir-jpaserver-starter</artifactId>
+    <groupId>edu.washington.cirg</groupId>
+    <artifactId>hapi-fhir-oauth2-starter</artifactId>
 
     <prerequisites>
         <maven>3.5.0</maven>
@@ -254,7 +255,7 @@
 
     <packaging>war</packaging>
 
-    <name>HAPI FHIR JPA Server - Starter Project</name>
+    <name>UW CIRG HAPI FHIR JPA Server </name>
 
     <repositories>
         <repository>
@@ -300,6 +301,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
+                    <attachClasses>true</attachClasses>
                     <archive>
                         <manifestEntries>
                             <Build-Time>${maven.build.timestamp}</Build-Time>

src/main/java/ca/uhn/fhir/jpa/starter/ApplicationContext.java → 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;

src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java → 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() {

src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu2.java → 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;

src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu3.java → 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;

src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java → 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;

src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR5.java → 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;

src/main/java/ca/uhn/fhir/jpa/starter/FhirTesterConfig.java → 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;

src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java → 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;

src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java → 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;

src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java → src/test/java/edu/washington/cirg/fhir/jpa/starter/ExampleServerDstu2IT.java

@@ -1,11 +1,13 @@
-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;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 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;

src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java → 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;

src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java → 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;

src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java → 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;

src/test/java/ca/uhn/fhir/jpa/starter/RandomServerPortProvider.java → 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<Integer> ourPorts = new ArrayList<Integer>(); 
-
-	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<Integer> 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<Integer> ourPorts = new ArrayList<Integer>(); 
+
+	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<Integer> list() {
+		return ourPorts;
+	}
+
+}
 

src/test/java/ca/uhn/fhir/jpa/starter/SocketImplementation.java → 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;