From 9449df7df19a6b8791549b9f6012d3cc6f2a3fd4 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Wed, 3 Feb 2016 08:35:05 -0500 Subject: [PATCH] Prepare for 1.4 release --- hapi-fhir-android/pom.xml | 32 ++++++++++++++++++++- hapi-fhir-osgi-core/pom.xml | 1 - pom.xml | 5 ++++ src/site/fml/hapi-fhir-faq.fml | 21 ++++++++++++++ src/site/site.xml | 1 + src/site/xdoc/doc_dstu2.xml | 51 +++++++++++++++++++++++----------- src/site/xdoc/download.xml.vm | 4 +-- 7 files changed, 95 insertions(+), 20 deletions(-) diff --git a/hapi-fhir-android/pom.xml b/hapi-fhir-android/pom.xml index 515e7a43fbe..c61df1daf49 100644 --- a/hapi-fhir-android/pom.xml +++ b/hapi-fhir-android/pom.xml @@ -60,6 +60,12 @@ 1.4-SNAPSHOT true + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu3 + 1.4-SNAPSHOT + true + org.apache.httpcomponents httpclient-android @@ -135,7 +141,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 true true @@ -259,6 +264,31 @@ + + + dstu3 + package + + shade + + + dstu3 + + + ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3 + + + + + + diff --git a/hapi-fhir-osgi-core/pom.xml b/hapi-fhir-osgi-core/pom.xml index 00d5f9a4e40..d6db60111c7 100644 --- a/hapi-fhir-osgi-core/pom.xml +++ b/hapi-fhir-osgi-core/pom.xml @@ -101,7 +101,6 @@ - diff --git a/pom.xml b/pom.xml index 5d916680eba..b5a9807f9cc 100644 --- a/pom.xml +++ b/pom.xml @@ -728,6 +728,11 @@ maven-failsafe-plugin 2.19.1 + + org.apache.maven.plugins + maven-shade-plugin + 2.4.3 + org.apache.maven.plugins maven-source-plugin diff --git a/src/site/fml/hapi-fhir-faq.fml b/src/site/fml/hapi-fhir-faq.fml index 275f88d15b8..2bcd04240d9 100644 --- a/src/site/fml/hapi-fhir-faq.fml +++ b/src/site/fml/hapi-fhir-faq.fml @@ -2,6 +2,27 @@ + + Getting Help + + Where can I ask questions or get help? + +

+ We ask that any questions about how to use HAPI FHIR be directed to + the HAPI FHIR Google Group. + This group is a great resource, with lots of helpful people who can assist. The + HAPI FHIR developers are regular contributors to this group. +

+

+ If you have questions which are about FHIR itself (e.g. which resource should + I use for a specific purpose, how to I model my data, etc.) you might want + to also consider posting on Stackoverflow, + as there are a number of FHIR experts who aren't HAPI/Java users who monitor + that site. +

+ + + JPA Server diff --git a/src/site/site.xml b/src/site/site.xml index ffd7319864e..10c18bcd022 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -134,6 +134,7 @@ + diff --git a/src/site/xdoc/doc_dstu2.xml b/src/site/xdoc/doc_dstu2.xml index 2186ff64a55..e0ed404f547 100644 --- a/src/site/xdoc/doc_dstu2.xml +++ b/src/site/xdoc/doc_dstu2.xml @@ -2,16 +2,16 @@ - FHIR DSTU2.1 Support + FHIR DSTU3 Support James Agnew -
+

- Although DSTU2.1 has not yet been balloted and finalized by HL7, + Although DSTU3 has not yet been balloted and finalized by HL7, there are several proposed changes which have been incorporated into the current Continuous Integration Builds @@ -19,10 +19,10 @@ as a part of testing scenarios in FHIR Connectathons.

- HAPI has support for DSTU2.1 definitions, based on the snapshot + HAPI has support for DSTU3 definitions, based on the snapshot of the resource definitions available at the time that a given version of HAPI is released. These structures are found - in the hapi-fhir-structures-dstu2.1-[version].jar + in the hapi-fhir-structures-dstu3-[version].jar library, with the associated Schemas, ValueSets, and other textual resources being found in hapi-fhir-validation-resources-[version].jar. @@ -30,7 +30,7 @@ Downloads page.

- Migrating to DSTU2.1 doesd require some effort, as the resource + Migrating to DSTU3 does require some effort, as the resource definitions have been migrated to use the "Reference Implementation" structures. These are the resource definitions supplied by HL7, meaning that the process to merge these two libraries has now @@ -39,15 +39,34 @@

- At this point, the RI integration consists of a new parallel set of - classes representing the FHIR data model. For example, in addition to the - Patient classes representing HAPI's DSTU1 and DSTU2 models there is now - a new Patient class representing the RI structure (which is also a DSTU2 - structure). + Since the early days of the FHIR project, there have been two parallel + Java implementations of the FHIR Specification: HAPI and the Reference + Implementation (RI). The two libraries both had separate data models and parsers, + but had little overlap in features other than that. HAPI has a server, + database, and rich fluent client that the RI did not have. The RI had + profile validation, snapshot generation, and a set other of great utilities that + HAPI did not have.

+

+ Over the last year, we have been working to bring the two projects + together, in order to reduce duplication of effort and let all + Java users take advantage of the entire set of available tools. +

+

+ The biggest change to HAPI users coming from this merging is the adoption + of the new RI data structure classes. For users of FHIR DSTU2, we provided + a parallel set of structures so that users could choose which library to + use (hapi-fhir-structures-dstu2 for HAPI structures, + or hapi-fhir-structures-hl7org-dstu2 for RI structures). For + DSTU3 we will be using the RI structures only, so users will need to migrate + to use these. +

+ +

The reference implementation (RI) structures have been added as a new - maven dependency library called hapi-fhir-structures-hl7org-dstu2. See + maven dependency library called hapi-fhir-structures-dstu3. + See the download page for information on the Maven dependencies for this version of the structures.

@@ -68,7 +87,7 @@ - +

Using these structures is similar to using other structures: @@ -95,7 +114,7 @@

For these methods, you may cast the IBaseResource to IResource if you are using DSTU2 structures, or to - IAnyResource if you are using DSTU2.1 structures. + IAnyResource if you are using DSTU3 structures.

@@ -149,14 +168,14 @@

Setter Names

  • - Names for some component setters/mutators have changed + Names for some component setters/mutators have changed in the new structures. In the old structures if the field type was a primitive (e.g. a string) there would be two setters: setName(String) and setName(StringDt). In the new structures, the setters are called setName(String) and setNameElement(StringType). This is more - consistent with the way the getters are named. + consistent with the way the getters are named.
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm index 5c0cd4424e8..c25beb5164e 100644 --- a/src/site/xdoc/download.xml.vm +++ b/src/site/xdoc/download.xml.vm @@ -50,9 +50,9 @@ DSTU2 1.0.2 - hapi-fhir-structures-dstu2.1 + hapi-fhir-structures-dstu3 1.4 - DSTU2 1.2.0 Snapshot (SVN 7507) + DSTU2 1.3.0 Snapshot (SVN 7602)