diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java index ce4e55a616b..0ff5e9c3b3a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java @@ -39,21 +39,19 @@ public abstract class BaseOperationOutcome extends BaseResource implements IReso public abstract BaseIssue getIssueFirstRep(); public static abstract class BaseIssue extends BaseIdentifiableElement implements IResourceBlock { - + public abstract CodeDt getSeverityElement(); - + public abstract StringDt getDetailsElement(); public abstract BaseCodingDt getType(); - public abstract BaseIssue addLocation( String theString); + public abstract BaseIssue addLocation(String theString); public abstract BaseIssue setDetails(String theString); public abstract StringDt getLocationFirstRep(); - + } - - } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseSecurityEvent.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseSecurityEvent.java new file mode 100644 index 00000000000..c35daaec293 --- /dev/null +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseSecurityEvent.java @@ -0,0 +1,28 @@ +package ca.uhn.fhir.model.base.resource; + +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 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 ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IResource; + +public abstract class BaseSecurityEvent extends BaseResource implements IResource { + +} diff --git a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/client/ClientTest.java b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/client/ClientTest.java index d1ab070b66e..182b6947e17 100644 --- a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/client/ClientTest.java +++ b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/client/ClientTest.java @@ -15,7 +15,6 @@ import java.nio.charset.Charset; import java.util.Arrays; import java.util.Date; import java.util.List; -import java.util.TimeZone; import org.apache.commons.io.IOUtils; import org.apache.commons.io.input.ReaderInputStream; diff --git a/hapi-tinder-plugin/src/main/resources/vm/resource.vm b/hapi-tinder-plugin/src/main/resources/vm/resource.vm index 1bfcdf615eb..b66e408c89e 100644 --- a/hapi-tinder-plugin/src/main/resources/vm/resource.vm +++ b/hapi-tinder-plugin/src/main/resources/vm/resource.vm @@ -40,7 +40,7 @@ import ${import}; */ @ResourceDef(name="${elementName}", profile="${profile}", id="${id}") public class ${className} - extends #{if}( ${className}=="OperationOutcome" || ${className}=="Conformance" ) ca.uhn.fhir.model.base.resource.Base${className} #{else} BaseResource #{end} + extends #{if}( ${className}=="OperationOutcome" || ${className}=="Conformance" || ${className}=="SecurityEvent" ) ca.uhn.fhir.model.base.resource.Base${className} #{else} BaseResource #{end} implements IResource { #foreach ( $param in $searchParams ) diff --git a/hapi-tinder-plugin/src/main/resources/vm/resource_dstu.vm b/hapi-tinder-plugin/src/main/resources/vm/resource_dstu.vm index ea065de17af..b8f7cb50bf9 100644 --- a/hapi-tinder-plugin/src/main/resources/vm/resource_dstu.vm +++ b/hapi-tinder-plugin/src/main/resources/vm/resource_dstu.vm @@ -39,7 +39,7 @@ import ${import}; */ @ResourceDef(name="${elementName}", profile="${profile}", id="${id}") public class ${className} - extends #{if}( ${className}=="OperationOutcome" || ${className}=="Conformance" ) ca.uhn.fhir.model.base.resource.Base${className} #{else} BaseResource #{end} + extends #{if}( ${className}=="OperationOutcome" || ${className}=="Conformance" || ${className}=="SecurityEvent" ) ca.uhn.fhir.model.base.resource.Base${className} #{else} BaseResource #{end} implements IResource { #foreach ( $param in $searchParams ) diff --git a/src/site/xdoc/doc_upgrading.xml b/src/site/xdoc/doc_upgrading.xml index 7481a2dcf24..926e3ee57aa 100644 --- a/src/site/xdoc/doc_upgrading.xml +++ b/src/site/xdoc/doc_upgrading.xml @@ -13,6 +13,41 @@ +

+ This section is still incomplete: Note that HAPI 0.8 has not + yet been released. This section provides details about how to use the + latest SNAPSHOT release, but it will continue to be enhanced as we move towards + the final 0.8 release. +

+ + + +

+ Beginning in HAPI-FHIR 0.8, the main distribution has been split from one + JAR to a set of JAR files. You will need at least two to use HAPI: +

+ + + +