Site updates

This commit is contained in:
James Agnew 2015-03-02 17:04:09 -05:00
parent 748efc4a97
commit 722f08de13
4 changed files with 79 additions and 25 deletions

View File

@ -21,8 +21,8 @@ public class Dstu2Examples {
@SuppressWarnings("unused")
public void getResourceTags() {
// START SNIPPET: context
// Create a "dev" context, which supports DSTU2
FhirContext ctx = FhirContext.forDev();
// Create a DSTU2 context, which will use DSTU2 semantics
FhirContext ctx = FhirContext.forDstu2();
// This parser supports DSTU2
IParser parser = ctx.newJsonParser();
@ -40,10 +40,10 @@ public class Dstu2Examples {
@Override
protected void initialize() throws ServletException {
// In your initialize method, assign a DEV FhirContext. This
// In your initialize method, assign a DSTU2 FhirContext. This
// is all that is required in order to put the server
// into DSTU2 mode
setFhirContext(FhirContext.forDev());
setFhirContext(FhirContext.forDstu2());
// Then set resource providers as normal, and do any other
// configuration you need to do.

View File

@ -0,0 +1,42 @@
package ca.uhn.fhir.rest.annotation;
/*
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* RESTful method annotation used for a method which provides
* FHIR "operations".
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(value=ElementType.METHOD)
public @interface Operation {
/**
* The name of the operation
*/
String name();
}

View File

@ -70,11 +70,6 @@
<item name="License" href="license.html" />
</menu>
<menu name="Test Servers">
<item name="Public Test Server" href="http://fhirtest.uhn.ca"/>
<item name="Vagrant Private Test Server" href="./doc_vagrant.html"/>
</menu>
<menu name="Documentation" inherit="top" >
<item name="Documentation Index" href="./docindex.html"/>
<item name="Introduction" href="./doc_intro.html"/>
@ -110,8 +105,8 @@
</item>
</menu>
<!-- JavaDoc (with no "s") is for the bottom menu -->
<menu name="JavaDoc" inherit="top">
<!-- Javadocs/JXR is for the bottom menu -->
<menu name="JavaDocs" inherit="top">
<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" />
@ -126,8 +121,14 @@
<item name="Issue Tracker" href="https://github.com/jamesagnew/hapi-fhir/issues" />
</menu>
<menu name="Test Servers">
<item name="Public Test Server" href="http://fhirtest.uhn.ca"/>
<item name="Vagrant Private Test Server" href="./doc_vagrant.html"/>
</menu>
<menu name="Maven Reports" inherit="bottom">
<item name="Developers" href="team-list.html" />
<item name="Project Developers" href="team-list.html" />
<item name="Unit Test Report" href="surefire-report.html" />
<item name="FindBugs" href="findbugs.html" />
</menu>
@ -175,27 +176,38 @@
<docindex>
<toc>false</toc>
</docindex>
<docindex>
<sections>
<columns>2</columns>
<body />
<sidebar />
</sections>
</docindex>
</pages>
<theme>bootswatch-united</theme>
<toc>sidebar</toc>
<topNav>Documentation|Get Help|Test Servers</topNav>
<bottomNav maxSpan="9" >
<column>HAPI FHIR|Test Servers</column>
<column>JavaDoc|JXR</column>
<column>JavaDocs|JXR</column>
<column>Get Help|Maven Reports</column>
</bottomNav>
<!--
<highlightJs>true</highlightJs>
-->
<bottomDescription>
<![CDATA[
<bottomDescription><![CDATA[
HAPI FHIR is a Java implementation of the HL7 FHIR
(Fast Healthcare Interoperable Resources) specification.
This project is open source (licensed under the Apache Software
License 2.0) and 100% free to use.
]]>
</bottomDescription>
License 2.0) and 100% free to use.<br/><br/>
<a href="https://github.com/jamesagnew/hapi-fhir"><img src="./images/github-logo-mini.png" alt="Hosted on GitHub" border="0"/></a>
]]></bottomDescription>
<brand>
<name><![CDATA[
<span class="color-highlight">HAPI</span> FHIR
]]></name>
<href>http://jamesagnew.github.io/hapi-fhir/</href>
</brand>
</reflowSkin>
<fluidoSkin>

View File

@ -60,13 +60,13 @@
<p>
As of HAPI FHIR 0.9, support for DSTU2 has been added to the library. Although upgrading
existing applications from DSTU1 to DSTU2 will not be completely painless, we have
existing applications from DSTU1 to DSTU2 will not be painless, we have
tried as much as possible to make it easy.
</p>
<p>
First, support for DSTU2 capabilities has been added in a second optional dependency JAR which
you must add to your classpath. This JAR is called <code>hapi-structures-dev-[version].jar</code>.
you must add to your classpath. This JAR is called <code>hapi-structures-dstu2-[version].jar</code>.
See the <a href="./download.html">download page</a> for information on adding this JAR.
</p>
@ -78,7 +78,7 @@
</p>
<p>
To create a DSTU2 context, simply use the "forDev" factory method on the FhirContext class:
To create a DSTU2 context, simply use the "forDstu2" factory method on the FhirContext class:
</p>
<macro name="snippet">