Site and dist updates for 0.9 release
This commit is contained in:
James Agnew
parent
6a5bb4638a
commit
adfbfcb96b
|
|
@ -250,32 +250,6 @@ public class Bundle extends BaseBundle /* implements IElement */{
|
|||
return myEntries;
|
||||
}
|
||||
|
||||
// public static void main(String[] args) {
|
||||
//
|
||||
// FhirContext ctx = new FhirContext();
|
||||
// String txt = "<Organization xmlns=\"http://hl7.org/fhir\">\n" +
|
||||
// " <extension url=\"http://fhir.connectinggta.ca/Profile/organization#providerIdPool\">\n" +
|
||||
// " <valueUri value=\"urn:oid:2.16.840.1.113883.3.239.23.21.1\"/>\n" +
|
||||
// " </extension>\n" +
|
||||
// " <text>\n" +
|
||||
// " <status value=\"generated\"/>\n" +
|
||||
// " <div xmlns=\"http://www.w3.org/1999/xhtml\"/>\n" +
|
||||
// " </text>\n" +
|
||||
// " <identifier>\n" +
|
||||
// " <use value=\"official\"/>\n" +
|
||||
// " <label value=\"HSP 2.16.840.1.113883.3.239.23.21\"/>\n" +
|
||||
// " <system value=\"urn:cgta:hsp_ids\"/>\n" +
|
||||
// " <value value=\"urn:oid:2.16.840.1.113883.3.239.23.21\"/>\n" +
|
||||
// " </identifier>\n" +
|
||||
// " <name value=\"火星第五人民医院\"/>\n" +
|
||||
// "</Organization>";
|
||||
//
|
||||
// IGenericClient c = ctx.newRestfulGenericClient("http://fhirtest.uhn.ca/base");
|
||||
// c.registerInterceptor(new LoggingInterceptor(true));
|
||||
// c.update().resource(txt).withId("1665").execute();
|
||||
// }
|
||||
//
|
||||
|
||||
public StringDt getLinkBase() {
|
||||
if (myLinkBase == null) {
|
||||
myLinkBase = new StringDt();
|
||||
|
|
|
|||
|
|
@ -86,8 +86,9 @@
|
|||
<configuration>
|
||||
<attach>false</attach>
|
||||
<descriptors>
|
||||
<descriptor>${project.basedir}/src/assembly/hapi-fhir-all.xml</descriptor>
|
||||
<descriptor>${project.basedir}/src/assembly/hapi-fhir-standard-distribution.xml</descriptor>
|
||||
<descriptor>${project.basedir}/src/assembly/hapi-fhir-jpaserver-example.xml</descriptor>
|
||||
<descriptor>${project.basedir}/src/assembly/hapi-fhir-android-distribution.xml</descriptor>
|
||||
</descriptors>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
|
|
|||
|
|
@ -1,22 +1,21 @@
|
|||
<?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>jpaserver-example</id>
|
||||
<id>android-distribution</id>
|
||||
|
||||
<formats>
|
||||
<format>zip</format>
|
||||
<format>tar.bz2</format>
|
||||
<!--<format>tar.bz2</format>-->
|
||||
</formats>
|
||||
|
||||
<includeBaseDirectory>false</includeBaseDirectory>
|
||||
|
||||
<fileSets>
|
||||
<fileSet>
|
||||
<directory>${project.basedir}/../hapi-fhir-jpaserver-example</directory>
|
||||
<directory>${project.basedir}/../hapi-fhir-android/target/</directory>
|
||||
<outputDirectory>/</outputDirectory>
|
||||
<includes>
|
||||
<include>pom.xml</include>
|
||||
<include>src/**</include>
|
||||
<include>hapi-fhir-android-${project.version}.jar</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
</fileSets>
|
||||
|
|
@ -1,35 +1,24 @@
|
|||
<?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>all</id>
|
||||
<id>jpaserver-example</id>
|
||||
|
||||
<formats>
|
||||
<format>zip</format>
|
||||
<format>tar.bz2</format>
|
||||
<!--<format>tar.bz2</format>-->
|
||||
</formats>
|
||||
|
||||
<includeBaseDirectory>false</includeBaseDirectory>
|
||||
|
||||
<fileSets>
|
||||
<fileSet>
|
||||
<directory>${project.basedir}</directory>
|
||||
<directory>${project.basedir}/../hapi-fhir-jpaserver-example</directory>
|
||||
<outputDirectory>/</outputDirectory>
|
||||
<includes>
|
||||
<include>README*</include>
|
||||
<include>LICENSE*</include>
|
||||
<include>NOTICE*</include>
|
||||
<include>pom.xml</include>
|
||||
<include>src/**</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
</fileSets>
|
||||
|
||||
<dependencySets>
|
||||
<dependencySet>
|
||||
<outputDirectory>/lib</outputDirectory>
|
||||
<useProjectArtifact>true</useProjectArtifact>
|
||||
<unpack>false</unpack>
|
||||
<scope>runtime</scope>
|
||||
</dependencySet>
|
||||
</dependencySets>
|
||||
|
||||
|
||||
</assembly>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
<?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>hapi-fhir-standard-distribution</id>
|
||||
|
||||
<formats>
|
||||
<format>zip</format>
|
||||
<!--<format>tar.bz2</format>-->
|
||||
</formats>
|
||||
|
||||
<includeBaseDirectory>false</includeBaseDirectory>
|
||||
|
||||
<fileSets>
|
||||
<fileSet>
|
||||
<directory>${project.basedir}</directory>
|
||||
<outputDirectory>/</outputDirectory>
|
||||
<includes>
|
||||
<include>README*</include>
|
||||
<include>LICENSE*</include>
|
||||
<include>NOTICE*</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
</fileSets>
|
||||
|
||||
<dependencySets>
|
||||
<dependencySet>
|
||||
<outputDirectory>/lib</outputDirectory>
|
||||
<useProjectArtifact>true</useProjectArtifact>
|
||||
<unpack>false</unpack>
|
||||
<scope>runtime</scope>
|
||||
</dependencySet>
|
||||
</dependencySets>
|
||||
|
||||
|
||||
</assembly>
|
||||
|
|
@ -5,16 +5,16 @@
|
|||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
||||
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
||||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||
<dependent-module archiveName="hapi-fhir-jpaserver-base-0.9-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-jpaserver-base/hapi-fhir-jpaserver-base">
|
||||
<dependent-module archiveName="hapi-fhir-jpaserver-base-0.9.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-jpaserver-base/hapi-fhir-jpaserver-base">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<dependent-module archiveName="hapi-fhir-base-0.9-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-base/hapi-fhir-base">
|
||||
<dependent-module archiveName="hapi-fhir-base-0.9.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-base/hapi-fhir-base">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<dependent-module archiveName="hapi-fhir-structures-dstu-0.9-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-structures-dstu/hapi-fhir-structures-dstu">
|
||||
<dependent-module archiveName="hapi-fhir-structures-dstu-0.9.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-structures-dstu/hapi-fhir-structures-dstu">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<dependent-module archiveName="hapi-fhir-structures-dstu2-0.9-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-structures-dstu2/hapi-fhir-structures-dstu2">
|
||||
<dependent-module archiveName="hapi-fhir-structures-dstu2-0.9.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-structures-dstu2/hapi-fhir-structures-dstu2">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<dependent-module deploy-path="/" handle="module:/overlay/prj/hapi-fhir-testpage-overlay?includes=**/**&excludes=META-INF/MANIFEST.MF">
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ import org.apache.http.message.BasicStatusLine;
|
|||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.internal.stubbing.defaultanswers.ReturnsDeepStubs;
|
||||
|
||||
import ca.uhn.fhir.context.FhirContext;
|
||||
|
|
@ -71,6 +72,13 @@ public class BinaryClientTest {
|
|||
assertArrayEquals(new byte[] { 1, 2, 3, 4 }, resp.getContent());
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
IClient c = Mockito.mock(IClient.class, new ReturnsDeepStubs());
|
||||
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testCreate() throws Exception {
|
||||
Binary res = new Binary();
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
||||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
||||
<dependent-module archiveName="hapi-fhir-base-0.9-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-base/hapi-fhir-base">
|
||||
<dependent-module archiveName="hapi-fhir-base-0.9.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-base/hapi-fhir-base">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<dependent-module archiveName="hapi-fhir-structures-dstu-0.9-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-structures-dstu/hapi-fhir-structures-dstu">
|
||||
<dependent-module archiveName="hapi-fhir-structures-dstu-0.9.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-structures-dstu/hapi-fhir-structures-dstu">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<dependent-module deploy-path="/" handle="module:/overlay/prj/hapi-fhir-testpage-overlay?includes=**/**&excludes=META-INF/MANIFEST.MF">
|
||||
|
|
|
|||
|
|
@ -101,14 +101,15 @@
|
|||
</item>
|
||||
<item name="Logging" href="./doc_logging.html" />
|
||||
<item name="ETags" href="./doc_rest_etag.html" />
|
||||
<item name="Tinder Plugin" href="./doc_tinder.html" />
|
||||
<item name="JPA/Database Server" href="./doc_jpa.html" />
|
||||
<item name="Android Support" href="./doc_android.html" />
|
||||
<item name="JavaDocs" href="./apidocs/index.html">
|
||||
<item name="Core API" href="./apidocs/index.html" />
|
||||
<item name="Model API (DSTU1)" href="./apidocs-dstu/index.html" />
|
||||
<item name="Model API (DSTU2)" href="./apidocs-dstu2/index.html" />
|
||||
<item name="JPA Server API" href="./apidocs-jpaserver/index.html" />
|
||||
</item>
|
||||
<item name="Maven Plugin (hapi-tinder-plugin)" href="./doc_tinder.html" />
|
||||
</menu>
|
||||
|
||||
<!-- Javadocs/JXR is for the bottom menu -->
|
||||
|
|
|
|||
|
|
@ -0,0 +1,60 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
|
||||
|
||||
<properties>
|
||||
<title>Android Support</title>
|
||||
<author email="jamesagnew@users.sourceforge.net">James Agnew</author>
|
||||
</properties>
|
||||
|
||||
<body>
|
||||
|
||||
<section name="Android Client Development">
|
||||
|
||||
<p>
|
||||
HAPI now has a specially built binary (JAR) which can be used on Android. Android developers
|
||||
may use this JAR to take advantage of the FHIR model classes, and the FHIR client (running a FHIR server
|
||||
on Android is not yet supported. Help wanted!)
|
||||
</p>
|
||||
|
||||
<p>
|
||||
The Android JAR ships as a "shade JAR", meaning it is a single JAR containing all of the
|
||||
dependencies required in order to use HAPI FHIR. You should not need to include any other
|
||||
libraries.
|
||||
</p>
|
||||
<p>
|
||||
Note that the Android JAR is still new and hasn't received as much testing as other
|
||||
parts of the library. We would greatly appreciate feedback, testing, etc. Also note that
|
||||
because mobile apps run on less powerful hardware compared to desktop and server applications,
|
||||
it is all the more important to keep a single instance of the <code>FhirContext</code>
|
||||
around for good performance, since this object is expensive to create. We are hoping to
|
||||
improve performance of the creation of this object in a future release. If you are an
|
||||
Android developer and would like to help with this, please get in touch!
|
||||
</p>
|
||||
|
||||
<subsection name="Get the Android JAR">
|
||||
<p>
|
||||
To use the Android JAR from Maven, add the following dependency:
|
||||
</p>
|
||||
<source><![CDATA[<dependency>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-android</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>]]></source>
|
||||
|
||||
<p>
|
||||
Gradle users can use the following:
|
||||
</p>
|
||||
<source><![CDATA[dependencies {
|
||||
compile group: 'ca.uhn.hapi.fhir', name: 'hapi-fhir-android', version: '${project.version}'
|
||||
}]]></source>
|
||||
|
||||
<p>
|
||||
You may also download a copy from the GitHub
|
||||
<a href="https://github.com/jamesagnew/hapi-fhir/releases">Releases</a> page.
|
||||
</p>
|
||||
</subsection>
|
||||
</section>
|
||||
|
||||
</body>
|
||||
|
||||
</document>
|
||||
|
|
@ -40,11 +40,11 @@
|
|||
resources themselves, so the new bundle also gains the meta element described above.
|
||||
</li>
|
||||
<li>
|
||||
In <a href="http://hl7-fhir.github.io/json.html">JSON encoding</a>, the
|
||||
<strike>In <a href="http://hl7-fhir.github.io/json.html">JSON encoding</a>, the
|
||||
encoding of extensions has changed a bit, so that extensions on non-primitive
|
||||
elements now appear with the extension URL as the JSON key, instead of being
|
||||
a value in an object called "extension". See the JSON documentation to see how
|
||||
this new style looks.
|
||||
this new style looks.</strike> This change was reverted by HL7.
|
||||
</li>
|
||||
<li>
|
||||
A number of new resources have been added, and some existing resources have changed.
|
||||
|
|
|
|||
|
|
@ -46,13 +46,16 @@
|
|||
<li><a href="./doc_rest_server_interceptor.html">Interceptors (server)</a></li>
|
||||
<li><a href="./doc_server_tester.html">Web Testing UI</a></li>
|
||||
</ul>
|
||||
<!--
|
||||
<li name="Logging" href="./doc_logging.html" />
|
||||
<li name="ETags" href="./doc_rest_etag.html" />
|
||||
<li name="Tinder Plugin" href="./doc_tinder.html" />
|
||||
<li name="JPA/Database Server" href="./doc_jpa.html" />
|
||||
|
||||
<h4>Other Features</h4>
|
||||
|
||||
<ul>
|
||||
<li><a href="./doc_logging.html">Logging</a></li>
|
||||
<li><a href="./doc_rest_etag.html">ETags</a></li>
|
||||
<li><a href="./doc_jpa.html">JPA/Database Server</a></li>
|
||||
<li><a href="./doc_tinder.html">Maven Plugin (hapi-tinder-plugin)</a></li>
|
||||
</ul>
|
||||
-->
|
||||
|
||||
<h4>JavaDocs</h4>
|
||||
<ul>
|
||||
<li><a href="./apidocs/index.html">Core API</a></li>
|
||||
|
|
|
|||
|
|
@ -38,10 +38,10 @@
|
|||
<version>${project.version}</version>
|
||||
</dependency>]]></source>
|
||||
|
||||
<subsection name="Supporting DEV (DSTU2) Resources">
|
||||
<subsection name="Supporting DSTU2 Resources">
|
||||
|
||||
<p>
|
||||
HAPI also has a <code>hapi-fhir-structures-dev-[version].jar</code>, which
|
||||
HAPI also has a <code>hapi-fhir-structures-dstu2-[version].jar</code>, which
|
||||
contains the latest versions of the releases. You can include this JAR on
|
||||
your classpath if you want to use resources that were created or updated by
|
||||
HL7 after the DSTU1 release. Be warned though that using these resources
|
||||
|
|
@ -54,7 +54,7 @@
|
|||
</p>
|
||||
<source><![CDATA[<dependency>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-structures-dev</artifactId>
|
||||
<artifactId>hapi-fhir-structures-dstu2</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>]]></source>
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,48 @@
|
|||
|
||||
<section name="Announcements">
|
||||
|
||||
<p>
|
||||
<b>March 14, 2015 - HAPI FHIR 0.9 Released</b> - HAPI 0.9 has now been released. This
|
||||
release is an important one. It brings a number of fixes and new features, and most importantly
|
||||
brings suport for DSTU2 resources and parsing/encoding. DSTU2 is the upcoming next version
|
||||
of the FHIR specification itself. Also of particular note, the
|
||||
<a href="./doc_jpa.html">JPA Server</a> has graduated to being included in the
|
||||
Maven repos (so you can create your own server which works just like <a href="http://fhirtest.uhn.ca">ours</a>).
|
||||
The <a href="./doc_android.html">Android JAR</a> has also been included.
|
||||
</p>
|
||||
<p>
|
||||
As always, you can see the complete list of what has
|
||||
changed by consulting the <a href="./changes-report.html">changelog</a>, and the
|
||||
<a href="./download.html">download page</a> has information on where to get it.
|
||||
</p>
|
||||
<p>
|
||||
<b>Note on DSTU2:</b> It is important to note that DSTU2 is not yet formally ballotted by HL7, and as such it
|
||||
is subject to change. A number of developers are starting to target it however, so support
|
||||
was important to us at HAPI HQ. See the <a href="./doc_dstu2.html">HAPI DSTU2 page</a>
|
||||
for information about how to add support for FHIR DSTU2 in your applications.
|
||||
</p>
|
||||
<p>
|
||||
<b>What's Next:</b> We are planning on making the next release of HAPI be the 1.0 release.
|
||||
The biggest development on our plate for the next development cycle will be to finish
|
||||
the integration of the HL7.org structure classes. Some people may have noticed a project
|
||||
in our GitHub repo called "hapi-fhir-structures-hl7org" that isn't a part of the current build.
|
||||
What we are trying to do is to unify the HL7.org Java Reference Implementation data model with
|
||||
the HAPI one in a single set of classes. This will mean that HAPI users can take advantage
|
||||
of tools from the RI (such as the excellent validator that comes with it) and users of the
|
||||
RI can take advantage of HAPI's client and server toolkits. It is still not 100% clear what
|
||||
this integration will look like when it is complete, but that should become clear in the
|
||||
coming weeks.
|
||||
</p>
|
||||
<p>
|
||||
As always, thanks to everyone who contributed code, pull requests, and filed bugs to make
|
||||
this release better. HAPI FHIR is the collective work of a large number of people now
|
||||
and we all benefit from the collective hard work being put in from around the world!
|
||||
</p>
|
||||
<p>
|
||||
- <a href="mailto:jamesagnew@users.sourceforge.net">James Agnew</a>
|
||||
</p>
|
||||
|
||||
<!--
|
||||
<p>
|
||||
<b>Dec 17, 2014 - HAPI FHIR 0.8 Released</b> - HAPI 0.8 has been released!
|
||||
As always, thanks to everyone who contributed on this; this release includes
|
||||
|
|
@ -112,7 +154,6 @@
|
|||
- <a href="mailto:jamesagnew@users.sourceforge.net">James Agnew</a>
|
||||
</p>
|
||||
|
||||
<!--
|
||||
<p>
|
||||
<b>Sep 8, 2014 - HAPI FHIR 0.6 Released</b> - A new build has been uploaded,
|
||||
containing a number of new features and bug fixes. See the changelog
|
||||
|
|
|
|||
Loading…
Reference in New Issue