Skip to content

Commit

Permalink
Website tweaks for 3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamesagnew
jamesagnew committed Sep 26, 2017
1 parent af2a7f0 commit 2085e30
Show file tree
Hide file tree
Showing 3 changed files with 170 additions and 70 deletions.
24 changes: 22 additions & 2 deletions hapi-fhir-dist/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -52,7 +52,27 @@
<classifier>javadoc</classifier>
<scope>provided</scope>
</dependency>


<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-utilities</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-utilities</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-utilities</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-dstu2</artifactId>
Expand Down
101 changes: 43 additions & 58 deletions hapi-fhir-dist/src/assembly/hapi-fhir-android-distribution.xml
View file
Original file line number Diff line number Diff line change
@@ -1,58 +1,43 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">

<id>android-distribution</id>

<formats>
<format>zip</format>
<format>tar.bz2</format>
</formats>

<includeBaseDirectory>false</includeBaseDirectory>

<fileSets>
<fileSet>
<directory>${project.basedir}/../hapi-fhir-android/target/</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>hapi-fhir-android-${project.version}-dstu.jar</include>
<include>hapi-fhir-android-${project.version}-dstu-sources.jar</include>
<include>hapi-fhir-android-${project.version}-dstu2.jar</include>
<include>hapi-fhir-android-${project.version}-dstu2-sources.jar</include>
<include>hapi-fhir-android-${project.version}-dstu3.jar</include>
<include>hapi-fhir-android-${project.version}-dstu3-sources.jar</include>
</includes>
</fileSet>
</fileSets>

<dependencySets>
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<unpack>false</unpack>
<scope>provided</scope>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>ca.uhn.hapi.fhir:hapi-fhir-android</include>
</includes>
<excludes>
<exclude>ca.uhn.hapi.fhir:hapi-fhir-base</exclude>
<exclude>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu</exclude>
<exclude>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu2</exclude>
<exclude>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3</exclude>
<exclude>ca.uhn.hapi.fhir:hapi-fhir-structures-hl7org-dstu2</exclude>
<exclude>ca.uhn.hapi.fhir:hapi-fhir-validation-resources-dstu2</exclude>
<exclude>ca.uhn.hapi.fhir:hapi-fhir-validation-resources-dstu3</exclude>
<exclude>org.glassfish:javax.json</exclude>
<exclude>org.codehaus.woodstox:woodstox-core-asl</exclude>
<exclude>javax.xml.stream:stax-api</exclude>
<exclude>org.codehaus.woodstox:stax2-api</exclude>
<exclude>org.glassfish:javax.json</exclude>
</excludes>
</dependencySet>
</dependencySets>


</assembly>
<?xml version="1.0" encoding="ISO-8859-1"?>
<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">

<id>android-distribution</id>

<formats>
<format>zip</format>
<format>tar.bz2</format>
</formats>

<includeBaseDirectory>false</includeBaseDirectory>

<dependencySets>
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<unpack>false</unpack>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>ca.uhn.hapi.fhir:hapi-fhir-base</include>
<include>ca.uhn.hapi.fhir:hapi-fhir-utilities</include>
<include>ca.uhn.hapi.fhir:hapi-fhir-android</include>
<include>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu2</include>
<include>ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3</include>
<include>ca.uhn.hapi.fhir:hapi-fhir-structures-r4</include>
</includes>
<excludes>
<exclude>*:*:sources</exclude>
<exclude>*:*:javadoc</exclude>
<exclude>ca.uhn.hapi.fhir:hapi-fhir-validation-resources-dstu2</exclude>
<exclude>ca.uhn.hapi.fhir:hapi-fhir-validation-resources-dstu3</exclude>
<exclude>ca.uhn.hapi.fhir:hapi-fhir-validation-resources-r4</exclude>
<exclude>org.codehaus.woodstox:woodstox-core-asl</exclude>
<exclude>javax.xml.stream:stax-api</exclude>
<exclude>org.codehaus.woodstox:stax2-api</exclude>
</excludes>
</dependencySet>
</dependencySets>


</assembly>
115 changes: 105 additions & 10 deletions src/site/xdoc/download.xml.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,20 @@
<title>Download</title>
</properties>

<head>
</head>

<body>

<section name="FHIR Versions">

<p>
The following table shows the various versions of the HAPI FHIR library, and
the versions of the FHIR standard that they support. Note that support for
stable releases of FHIR are shown in
<span style="background: #CEC; padding: 3px;">GREEN</span>
and support for draft pre-release versions of FHIR are shown in
<span style="background: #EEB; padding: 3px;">YELLOW</span>.
</p>
<table>
<thead>
<tr>
Expand All @@ -24,15 +34,15 @@
<tr>
<td>HAPI FHIR 1.1</td>
<td style="background: #CEC;">0.0.82</td>
<td style="background: #EEB;">Draft 0.5.0</td>
<td style="background: #EEB;">Draft 0.5.0-5843</td>
<td style="background: #DDD;"></td>
<td style="background: #DDD;"></td>
<td style="background: #DDD;"></td>
</tr>
<tr>
<td>HAPI FHIR 1.2</td>
<td style="background: #CEC;">0.0.82</td>
<td style="background: #EEB;">Draft 0.5.0</td>
<td style="background: #EEB;">Draft 0.5.0-5843</td>
<td style="background: #DDD;"></td>
<td style="background: #DDD;"></td>
<td style="background: #DDD;"></td>
Expand All @@ -50,55 +60,55 @@
<td style="background: #CEC;">0.0.82</td>
<td style="background: #CEC;">1.0.2</td>
<td style="background: #DDD;"></td>
<td style="background: #EEB;">Draft 1.3.0</td>
<td style="background: #EEB;">Draft 1.3.0-7602</td>
<td style="background: #DDD;"></td>
</tr>
<tr>
<td>HAPI FHIR 1.5</td>
<td style="background: #CEC;">0.0.82</td>
<td style="background: #CEC;">1.0.2</td>
<td style="background: #DDD;"></td>
<td style="background: #EEB;">Draft 1.4.0</td>
<td style="background: #EEB;">Draft 1.4.0-8138</td>
<td style="background: #DDD;"></td>
</tr>
<tr>
<td>HAPI FHIR 1.6</td>
<td style="background: #CEC;">0.0.82</td>
<td style="background: #CEC;">1.0.2</td>
<td style="background: #DDD;"></td>
<td style="background: #EEB;">Draft 1.4.0</td>
<td style="background: #EEB;">Draft 1.4.0-8636</td>
<td style="background: #DDD;"></td>
</tr>
<tr>
<td>HAPI FHIR 2.0</td>
<td style="background: #CEC;">0.0.82</td>
<td style="background: #CEC;">1.0.2</td>
<td style="background: #DDD;"></td>
<td style="background: #EEB;">Draft 1.6.0</td>
<td style="background: #EEB;">Draft 1.6.0-9663</td>
<td style="background: #DDD;"></td>
</tr>
<tr>
<td>HAPI FHIR 2.1</td>
<td style="background: #CEC;">0.0.82</td>
<td style="background: #CEC;">1.0.2</td>
<td style="background: #DDD;"></td>
<td style="background: #EEB;">Draft 1.7.0</td>
<td style="background: #EEB;">Draft 1.7.0-10129</td>
<td style="background: #DDD;"></td>
</tr>
<tr>
<td>HAPI FHIR 2.2</td>
<td style="background: #CEC;">0.0.82</td>
<td style="background: #CEC;">1.0.2</td>
<td style="background: #EEB;">Draft 1.4.0</td>
<td style="background: #EEB;">Draft 1.8.0</td>
<td style="background: #EEB;">Draft 1.8.0-10528</td>
<td style="background: #DDD;"></td>
</tr>
<tr>
<td>HAPI FHIR 2.3</td>
<td style="background: #CEC;">0.0.82</td>
<td style="background: #CEC;">1.0.2</td>
<td style="background: #EEB;">Draft 1.4.0</td>
<td style="background: #EEB;">Draft 1.9.0</td>
<td style="background: #EEB;">Draft 1.9.0-11501</td>
<td style="background: #DDD;"></td>
</tr>
<tr>
Expand Down Expand Up @@ -129,6 +139,91 @@
</table>

</section>

<section name="HAPI FHIR Modules">
<p>
The following table shows the modules that make up the HAPI
FHIR library.
</p>
<table class="">
<tbody>
<tr><td colspan="2" style="text-align: center; font-size: 1.2em; background: #DDE; padding: 3px;">Core Libraries</td></tr>
<tr>
<td style="font-weight: bold; white-space: nowrap;">hapi-fhir-base</td>
<td>
This is the core HAPI FHIR library and is always required in order to use
the framework. It contains the context, parsers, and other support classes.
</td>
</tr>
<tr>
<td style="font-weight: bold; white-space: nowrap;">hapi-fhir-utilities</td>
<td>
This is a support library containing various utility methods for working with
FHIR. It is always required in order to use the framework.
</td>
</tr>
<tr><td style="text-align: center; font-size: 1.2em; background: #DDE; padding: 3px;" colspan="2">Structures</td></tr>
<tr>
<td style="font-weight: bold; white-space: nowrap;">hapi-fhir-structures-dstu</td>
<td>
This module contains FHIR DSTU1 model classes. It was retired in HAPI FHIR 3.0.0.
</td>
</tr>
<tr>
<td style="font-weight: bold; white-space: nowrap;">hapi-fhir-structures-dstu2</td>
<td>
This module contains FHIR DSTU2 model classes.
</td>
</tr>
<tr>
<td style="font-weight: bold; white-space: nowrap;">hapi-fhir-structures-hl7org-dstu2</td>
<td>
This module contains alternate FHIR DSTU2 model classes. The HAPI FHIR and FHIR "Java Reference Implementation"
libraries were merged in 2015, and at the time there were two parallel sets of DSTU2 model
classes. This set more closely resembles the model classes for DSTU3+ where the other set
more closely resembles the DSTU1 model classes. The two DSTU2 model JARs are functionally
identital, but the various utility methods on the classes are somewhat different.
</td>
</tr>
<tr>
<td style="font-weight: bold; white-space: nowrap;">hapi-fhir-structures-dstu3</td>
<td>
This module contains FHIR DSTU3 model classes.
</td>
</tr>
<tr>
<td style="font-weight: bold; white-space: nowrap;">hapi-fhir-structures-r4</td>
<td>
This module contains FHIR R4 model classes.
</td>
</tr>
<tr><td style="text-align: center; font-size: 1.2em; background: #DDE; padding: 3px;" colspan="2">Client Framework</td></tr>
<tr>
<td style="font-weight: bold; white-space: nowrap;">hapi-fhir-client</td>
<td>
This module contains the core FHIR client framework, including an
HTTP implementation based on
<a href="https://hc.apache.org/">Apache HttpClient</a>. It is required in order
to use client functionality in HAPI.
</td>
</tr>
<tr>
<td style="font-weight: bold; white-space: nowrap;">hapi-fhir-client-okhttp</td>
<td>
This module contains an alternate HTTP implementation based on
<a href="http://square.github.io/okhttp/">OKHTTP</a>.
</td>
</tr>
<tr>
<td style="font-weight: bold; white-space: nowrap;">hapi-fhir-android</td>
<td>
This module contains the Android HAPI FHIR framework, which is a FHIR
client framework which has been tailed specifically to run on Android.
</td>
</tr>
</tbody>
</table>
</section>

<section name="Downloading HAPI FHIR">
<p>
Expand Down

0 comments on commit 2085e30

Please sign in to comment.