From c04c5872cf3da84d768aa0bffaced542f144000f Mon Sep 17 00:00:00 2001 From: Kai Liu Date: Wed, 28 Mar 2018 17:38:02 -0400 Subject: [PATCH 1/2] update project to 3.1.0-SNAPSHOT --- .../hapi-fhir-jpaserver-example-postgres/pom.xml | 10 +++++----- .../java/ca/uhn/fhir/jpa/demo/FhirServerConfig.java | 3 ++- .../main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/pom.xml b/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/pom.xml index 3cb4741f06c..b50492dc1ea 100644 --- a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/pom.xml +++ b/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/pom.xml @@ -10,7 +10,7 @@ ca.uhn.hapi.fhir hapi-fhir - 2.1-SNAPSHOT + 3.3.0-SNAPSHOT ../../pom.xml @@ -26,28 +26,28 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.1-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-jpaserver-base - 2.1-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 2.1-SNAPSHOT + ${project.version} war provided ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 2.1-SNAPSHOT + ${project.version} classes provided diff --git a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfig.java b/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfig.java index ae55d7a1ed3..0d29294f06c 100644 --- a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfig.java +++ b/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfig.java @@ -21,6 +21,7 @@ import ca.uhn.fhir.jpa.util.SubscriptionsRequireManualActivationInterceptorDstu3 import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor; import ca.uhn.fhir.rest.server.interceptor.LoggingInterceptor; import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor; +import ca.uhn.fhir.jpa.search.LuceneSearchMappingFactory; /** * This class isn't used by default by the example, but @@ -84,7 +85,7 @@ public class FhirServerConfig extends BaseJavaConfigDstu3 { extraProperties.put("hibernate.cache.use_second_level_cache", "false"); extraProperties.put("hibernate.cache.use_structured_entries", "false"); extraProperties.put("hibernate.cache.use_minimal_puts", "false"); - extraProperties.put("hibernate.search.model_mapping", SearchMappingFactory.class.getName()); + extraProperties.put("hibernate.search.model_mapping", LuceneSearchMappingFactory.class.getName()); extraProperties.put("hibernate.search.default.directory_provider", "filesystem"); extraProperties.put("hibernate.search.default.indexBase", "target/lucenefiles"); extraProperties.put("hibernate.search.lucene_version", "LUCENE_CURRENT"); diff --git a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java b/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java index 8b51ff4bc54..f45045cf755 100644 --- a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java +++ b/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java @@ -18,7 +18,7 @@ import ca.uhn.fhir.jpa.provider.dstu3.TerminologyUploaderProviderDstu3; import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider; import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator; import ca.uhn.fhir.rest.server.ETagSupportEnum; -import ca.uhn.fhir.rest.server.EncodingEnum; +import ca.uhn.fhir.rest.api.EncodingEnum; import ca.uhn.fhir.rest.server.IResourceProvider; import ca.uhn.fhir.rest.server.RestfulServer; import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor; From 78c23047be6e60c0094a673363f78e1af938467c Mon Sep 17 00:00:00 2001 From: Kai Liu Date: Thu, 29 Mar 2018 11:35:58 -0400 Subject: [PATCH 2/2] update readme --- .../hapi-fhir-jpaserver-example-postgres/readme.intellij.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/readme.intellij.txt b/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/readme.intellij.txt index 049d5d341a5..283b1536de0 100644 --- a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/readme.intellij.txt +++ b/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/readme.intellij.txt @@ -1,6 +1,8 @@ Running hapi-fhir-jpaserver-example in Tomcat from IntelliJ Install Tomcat. +Install mvn +run `mvn clean install` Make sure you have Tomcat set up in IntelliJ. File->Settings->Build, Execution, Deployment->Application Servers @@ -26,6 +28,6 @@ Select your server, and click the green triangle (or the bug if you want to debu Wait for the console output to stop Point your browser (or fiddler, or what have you) to -http://localhost:8080/hapi/base/Patient +http://localhost:8080/hapi/baseDstu3/Patient You should get an empty bundle back. \ No newline at end of file