Merge pull request #3 from kml27/migrate-package

Migrating to unique namespace(s), classes jar
uwcirg · Nov 6, 2020 · 58160f0 · 58160f0
2 parents 61a2181 + e4213b5
commit 58160f0
Show file tree

Hide file tree

Showing 19 changed files with 74 additions and 57 deletions.
diff --git 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
+.apdisk
+
+# settings.xml copied from local dev workflow for tiny-maven-proxy
+settings.xml
diff --git a/docker-build.bat b/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 .
diff --git a/pom.xml b/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>

diff --git a/.../fhir/jpa/starter/ApplicationContext.java → .../fhir/jpa/starter/ApplicationContext.java b/.../fhir/jpa/starter/ApplicationContext.java → .../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/...r/jpa/starter/FhirServerConfigCommon.java → ...r/jpa/starter/FhirServerConfigCommon.java b/...r/jpa/starter/FhirServerConfigCommon.java → ...r/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/...ir/jpa/starter/FhirServerConfigDstu2.java → ...ir/jpa/starter/FhirServerConfigDstu2.java b/...ir/jpa/starter/FhirServerConfigDstu2.java → ...ir/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/...ir/jpa/starter/FhirServerConfigDstu3.java → ...ir/jpa/starter/FhirServerConfigDstu3.java b/...ir/jpa/starter/FhirServerConfigDstu3.java → ...ir/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/.../fhir/jpa/starter/FhirServerConfigR4.java → .../fhir/jpa/starter/FhirServerConfigR4.java b/.../fhir/jpa/starter/FhirServerConfigR4.java → .../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/.../fhir/jpa/starter/FhirServerConfigR5.java → .../fhir/jpa/starter/FhirServerConfigR5.java b/.../fhir/jpa/starter/FhirServerConfigR5.java → .../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/...hn/fhir/jpa/starter/FhirTesterConfig.java → ...rg/fhir/jpa/starter/FhirTesterConfig.java b/...hn/fhir/jpa/starter/FhirTesterConfig.java → ...rg/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/.../uhn/fhir/jpa/starter/HapiProperties.java → ...cirg/fhir/jpa/starter/HapiProperties.java b/.../uhn/fhir/jpa/starter/HapiProperties.java → ...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/...hn/fhir/jpa/starter/JpaRestfulServer.java → ...rg/fhir/jpa/starter/JpaRestfulServer.java b/...hn/fhir/jpa/starter/JpaRestfulServer.java → ...rg/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/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -11,7 +11,7 @@
 	<context-param>
 		<param-name>contextClass</param-name>
 		<param-value>
-			ca.uhn.fhir.jpa.starter.ApplicationContext
+			edu.washington.cirg.fhir.jpa.starter.ApplicationContext
 		</param-value>
 	</context-param>
 	<context-param>
@@ -31,7 +31,7 @@
 		<init-param>
 			<param-name>contextConfigLocation</param-name>
 			<param-value>
-				ca.uhn.fhir.jpa.starter.FhirTesterConfig
+				edu.washington.cirg.fhir.jpa.starter.FhirTesterConfig
 			</param-value>
 		</init-param>
 		<load-on-startup>2</load-on-startup>
@@ -43,7 +43,7 @@
 
 	<servlet>
 		<servlet-name>fhirServlet</servlet-name>
-		<servlet-class>ca.uhn.fhir.jpa.starter.JpaRestfulServer</servlet-class>
+		<servlet-class>edu.washington.cirg.fhir.jpa.starter.JpaRestfulServer</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet-mapping>

diff --git a/...hir/jpa/starter/ExampleServerDstu2IT.java → ...hir/jpa/starter/ExampleServerDstu2IT.java b/...hir/jpa/starter/ExampleServerDstu2IT.java → ...hir/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;

diff --git a/...hir/jpa/starter/ExampleServerDstu3IT.java → ...hir/jpa/starter/ExampleServerDstu3IT.java b/...hir/jpa/starter/ExampleServerDstu3IT.java → ...hir/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/...n/fhir/jpa/starter/ExampleServerR4IT.java → ...g/fhir/jpa/starter/ExampleServerR4IT.java b/...n/fhir/jpa/starter/ExampleServerR4IT.java → ...g/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/...n/fhir/jpa/starter/ExampleServerR5IT.java → ...g/fhir/jpa/starter/ExampleServerR5IT.java b/...n/fhir/jpa/starter/ExampleServerR5IT.java → ...g/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/...jpa/starter/RandomServerPortProvider.java → ...jpa/starter/RandomServerPortProvider.java b/...jpa/starter/RandomServerPortProvider.java → ...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;
+	}
+
+}
 
diff --git a/...hir/jpa/starter/SocketImplementation.java → ...hir/jpa/starter/SocketImplementation.java b/...hir/jpa/starter/SocketImplementation.java → ...hir/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;
Original file line number	Diff line number	Diff line change
		@@ -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 .