diff --git a/hapi-fhir-base/.classpath b/hapi-fhir-base/.classpath index bb75ffa0b9e..a89a66967e1 100644 --- a/hapi-fhir-base/.classpath +++ b/hapi-fhir-base/.classpath @@ -82,5 +82,6 @@ + diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java index acbe1f7284b..7f00f4aab41 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java @@ -36,9 +36,7 @@ import ca.uhn.fhir.model.api.annotation.Choice; import ca.uhn.fhir.model.api.annotation.CodeTableDef; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.Extension; -import ca.uhn.fhir.model.api.annotation.Narrative; import ca.uhn.fhir.model.api.annotation.ResourceDef; -import ca.uhn.fhir.model.dstu.composite.NarrativeDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateDt; @@ -71,7 +69,6 @@ class ModelScanner { } private void init(Set> toScan) { - toScan.add(NarrativeDt.class); toScan.add(DateDt.class); toScan.add(CodeDt.class); @@ -264,18 +261,6 @@ class ModelScanner { for (Field next : theClass.getDeclaredFields()) { - Narrative hasNarrative = next.getAnnotation(Narrative.class); - if (hasNarrative != null) { - RuntimeChildNarrativeDefinition def; - try { - def = new RuntimeChildNarrativeDefinition(next, hasNarrative.name()); - } catch (Exception e) { - throw new ConfigurationException("Failed to find narrative field", e); - } - theDefinition.addChild(def); - continue; - } - Child element = next.getAnnotation(Child.class); if (element == null) { ourLog.debug("Ignoring non-type field '" + next.getName() + "' on target type: " + theClass); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildNarrativeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildNarrativeDefinition.java deleted file mode 100644 index ccb20bd93e3..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildNarrativeDefinition.java +++ /dev/null @@ -1,13 +0,0 @@ -package ca.uhn.fhir.context; - -import java.lang.reflect.Field; - -import ca.uhn.fhir.model.dstu.composite.NarrativeDt; - -public class RuntimeChildNarrativeDefinition extends BaseRuntimeChildDatatypeDefinition { - - public RuntimeChildNarrativeDefinition(Field theField, String theElementName) { - super(theField, theElementName, 1, 1, NarrativeDt.class); - } - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Narrative.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Narrative.java deleted file mode 100644 index cb9cf3a155f..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Narrative.java +++ /dev/null @@ -1,14 +0,0 @@ -package ca.uhn.fhir.model.api.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target(value= {ElementType.FIELD}) -public @interface Narrative { - - String name(); - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/BodySiteEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/BodySiteEnum.java deleted file mode 100644 index da6859527d9..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/BodySiteEnum.java +++ /dev/null @@ -1,9 +0,0 @@ -package ca.uhn.fhir.model.enm; - -import ca.uhn.fhir.model.api.ICodeEnum; -import ca.uhn.fhir.model.api.annotation.CodeTableDef; - -@CodeTableDef(name="body-site", tableId=62, restrictedToSnomedIsA= {91723000}) -public enum BodySiteEnum implements ICodeEnum { - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/IdentifierUseEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/IdentifierUseEnum.java deleted file mode 100644 index 8e33f0b1be9..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/IdentifierUseEnum.java +++ /dev/null @@ -1,25 +0,0 @@ -package ca.uhn.fhir.model.enm; - -import ca.uhn.fhir.model.api.ICodeEnum; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.EnumeratedCodeValue; -import ca.uhn.fhir.model.api.annotation.CodeTableDef; - -@CodeTableDef(name="identifier-use", tableId=13) -public enum IdentifierUseEnum implements ICodeEnum { - @EnumeratedCodeValue("usual") - @Description("the identifier recommended for display and use in real-world interactions.") - USUAL, - - @EnumeratedCodeValue("official") - @Description("the identifier considered to be most trusted for the identification of this item.") - OFFICIAL, - - @EnumeratedCodeValue("temp") - @Description("A temporary identifier.") - TEMP, - - @EnumeratedCodeValue("secondary") - @Description("An identifier that was assigned in secondary use - it serves to identify the object in a relative context, but cannot be consistently assigned to the same object again in a different context.") - SECONDARY -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/NarrativeStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/NarrativeStatusEnum.java deleted file mode 100644 index 603331f69b0..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/NarrativeStatusEnum.java +++ /dev/null @@ -1,26 +0,0 @@ -package ca.uhn.fhir.model.enm; - -import ca.uhn.fhir.model.api.ICodeEnum; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.EnumeratedCodeValue; -import ca.uhn.fhir.model.api.annotation.CodeTableDef; - -@CodeTableDef(tableId = 28, name = "narrative-status") -public enum NarrativeStatusEnum implements ICodeEnum { - - @EnumeratedCodeValue(value = "generated") - @Description("The contents of the narrative are entirely generated from the structured data in the resource.") - GENERATED, - - @EnumeratedCodeValue(value = "extensions") - @Description("The contents of the narrative are entirely generated from the structured data in the resource and some of the content is generated from extensions.") - EXTENSIONS, - - @EnumeratedCodeValue(value = "additional") - @Description("The contents of the narrative contain additional information not found in the structured data.") - ADDITIONAL, - - @EnumeratedCodeValue(value = "empty") - @Description("the contents of the narrative are some equivalent of \"No human-readable text provided for this resource\".") - EMPTY -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationCodesEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationCodesEnum.java deleted file mode 100644 index f35c2790a32..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationCodesEnum.java +++ /dev/null @@ -1,9 +0,0 @@ -package ca.uhn.fhir.model.enm; - -import ca.uhn.fhir.model.api.ICodeEnum; -import ca.uhn.fhir.model.api.annotation.CodeTableDef; - -@CodeTableDef(name="observation-codes", tableId=115) -public enum ObservationCodesEnum implements ICodeEnum { - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationInterpretationEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationInterpretationEnum.java deleted file mode 100644 index 943c5a0a497..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationInterpretationEnum.java +++ /dev/null @@ -1,126 +0,0 @@ -package ca.uhn.fhir.model.enm; - -import ca.uhn.fhir.model.api.ICodeEnum; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.EnumeratedCodeValue; -import ca.uhn.fhir.model.api.annotation.CodeTableDef; - -@CodeTableDef(tableId = 117, name = "observation-interpretation") -public enum ObservationInterpretationEnum implements ICodeEnum { - - @EnumeratedCodeValue(value = "<", system = "http://hl7.org/fhir/v2/0078") - @Description("Below absolute low-off instrument scale") - BELOW_ABSOLUTE_LOW, - - @EnumeratedCodeValue(value = ">", system = "http://hl7.org/fhir/v2/0078") - @Description("Above absolute high-off instrument scale") - ABOVE_ABSOLUTE_HIGH, - - @EnumeratedCodeValue(value = "A", system = "http://hl7.org/fhir/v2/0078") - @Description("Abnormal (applies to non-numeric results)") - A, - - @EnumeratedCodeValue(value = "AA", system = "http://hl7.org/fhir/v2/0078") - @Description("Very abnormal (applies to non-numeric units, analogous to panic limits for numeric units)") - AA, - - @EnumeratedCodeValue(value = "AC", system = "http://hl7.org/fhir/v2/0078") - @Description("Anti-complementary substances present") - AC, - - @EnumeratedCodeValue(value = "B", system = "http://hl7.org/fhir/v2/0078") - @Description("Better-use when direction not relevant") - B, - - @EnumeratedCodeValue(value = "D", system = "http://hl7.org/fhir/v2/0078") - @Description("Significant change down") - D, - - @EnumeratedCodeValue(value = "DET", system = "http://hl7.org/fhir/v2/0078") - @Description("Detected") - DET, - - @EnumeratedCodeValue(value = "H", system = "http://hl7.org/fhir/v2/0078") - @Description("Above high normal") - H, - - @EnumeratedCodeValue(value = "HH", system = "http://hl7.org/fhir/v2/0078") - @Description("Above upper panic limits") - HH, - - @EnumeratedCodeValue(value = "I", system = "http://hl7.org/fhir/v2/0078") - @Description("Intermediate. Indicates for microbiology susceptibilities only.") - I, - - @EnumeratedCodeValue(value = "IND", system = "http://hl7.org/fhir/v2/0078") - @Description("Indeterminate") - IND, - - @EnumeratedCodeValue(value = "L", system = "http://hl7.org/fhir/v2/0078") - @Description("Below low normal") - L, - - @EnumeratedCodeValue(value = "LL", system = "http://hl7.org/fhir/v2/0078") - @Description("Below lower panic limits") - LL, @EnumeratedCodeValue(value = "MS", system = "http://hl7.org/fhir/v2/0078") - @Description("Moderately susceptible. Indicates for microbiology susceptibilities only.") - MS, - - @EnumeratedCodeValue(value = "N", system = "http://hl7.org/fhir/v2/0078") - @Description("Normal (applies to non-numeric results)") - N, - - @EnumeratedCodeValue(value = "ND", system = "http://hl7.org/fhir/v2/0078") - @Description("Not Detected") - ND, - - @EnumeratedCodeValue(value = "NEG", system = "http://hl7.org/fhir/v2/0078") - @Description("Negative") - NEG, @EnumeratedCodeValue(value = "NR", system = "http://hl7.org/fhir/v2/0078") - @Description("Non-reactive") - NR, - - @EnumeratedCodeValue(value = "POS", system = "http://hl7.org/fhir/v2/0078") - @Description("Positive") - POS, - - @EnumeratedCodeValue(value = "QCF", system = "http://hl7.org/fhir/v2/0078") - @Description("Quality Control Failure") - QCF, - - @EnumeratedCodeValue(value = "R", system = "http://hl7.org/fhir/v2/0078") - @Description("Resistant. Indicates for microbiology susceptibilities only.") - R, - - @EnumeratedCodeValue(value = "RR", system = "http://hl7.org/fhir/v2/0078") - @Description("Reactive") - RR, - - @EnumeratedCodeValue(value = "S", system = "http://hl7.org/fhir/v2/0078") - @Description("Susceptible. Indicates for microbiology susceptibilities only.") - S, - - @EnumeratedCodeValue(value = "TOX", system = "http://hl7.org/fhir/v2/0078") - @Description("Cytotoxic substance present") - TOX, - - @EnumeratedCodeValue(value = "U", system = "http://hl7.org/fhir/v2/0078") - @Description("Significant change up") - U, - - @EnumeratedCodeValue(value = "VS", system = "http://hl7.org/fhir/v2/0078") - @Description("Very susceptible. Indicates for microbiology susceptibilities only.") - VS, - - @EnumeratedCodeValue(value = "W", system = "http://hl7.org/fhir/v2/0078") - @Description("Worse-use when direction not relevant") - W, - - @EnumeratedCodeValue(value = "WR", system = "http://hl7.org/fhir/v2/0078") - @Description("Weakly reactive") - WR, - - @EnumeratedCodeValue(value = "null", system = "http://hl7.org/fhir/v2/0078") - @Description("No range defined, or normal ranges don't apply") - NULL -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationMethodEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationMethodEnum.java deleted file mode 100644 index d6638e61de1..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationMethodEnum.java +++ /dev/null @@ -1,10 +0,0 @@ -package ca.uhn.fhir.model.enm; - -import ca.uhn.fhir.model.api.ICodeEnum; -import ca.uhn.fhir.model.api.annotation.CodeTableDef; - -@CodeTableDef(tableId=114, name="observation-method") -public enum ObservationMethodEnum implements ICodeEnum { - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationRelationshipTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationRelationshipTypeEnum.java deleted file mode 100644 index 82759760880..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationRelationshipTypeEnum.java +++ /dev/null @@ -1,38 +0,0 @@ -package ca.uhn.fhir.model.enm; - -import ca.uhn.fhir.model.api.ICodeEnum; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.EnumeratedCodeValue; -import ca.uhn.fhir.model.api.annotation.CodeTableDef; - -@CodeTableDef(tableId = 371, name = "observation-relationshiptype") -public enum ObservationRelationshipTypeEnum implements ICodeEnum { - - @EnumeratedCodeValue("has-component") - @Description("The target observation is a component of this observation (e.g. Systolic and Diastolic Blood Pressure).") - HAS_COMPONENT, - - @EnumeratedCodeValue("has-member") - @Description("This observation is a group observation (e.g. a battery, a panel of tests, a set of vital sign measurements) that includes the target as a member of the group.") - HAS_MEMBER, - - @EnumeratedCodeValue("derived-from") - @Description("The target observation is part of the information from which this observation value is derived (e.g. calculated anion gap, Apgar score).") - DERIVED_FROM, - - @EnumeratedCodeValue("sequel-to") - @Description("This observation follows the target observation (e.g. timed tests such as Glucose Tolerance Test).") - SEQUEL_TO, - - @EnumeratedCodeValue("replaces") - @Description("This observation replaces a previous observation (i.e. a revised value). The target observation is now obsolete.") - REPLACES, - - @EnumeratedCodeValue("qualified-by") - @Description("The value of the target observation qualifies (refines) the semantics of the source observation (e.g. a lipaemia measure target from a plasma measure).") - QUALIFIED_BY, - - @EnumeratedCodeValue("interfered-by") - @Description("The value of the target observation interferes (degardes quality, or prevents valid observation) with the semantics of the source observation (e.g. a hemolysis measure target from a plasma potassium measure which has no value).") - INTERFERED_BY -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationReliabilityEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationReliabilityEnum.java deleted file mode 100644 index cbf8e083acd..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationReliabilityEnum.java +++ /dev/null @@ -1,39 +0,0 @@ -package ca.uhn.fhir.model.enm; - -import ca.uhn.fhir.model.api.ICodeEnum; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.EnumeratedCodeValue; -import ca.uhn.fhir.model.api.annotation.CodeTableDef; - -@CodeTableDef(tableId=118, name="observation-reliability") -public enum ObservationReliabilityEnum implements ICodeEnum { - - @Description("The result has no reliability concerns.") - @EnumeratedCodeValue("ok") - OK, - - @Description("An early estimate of value; measurement is still occurring.") - @EnumeratedCodeValue("ongoing") - ONGOING, - - @Description("An early estimate of value; processing is still occurring.") - @EnumeratedCodeValue("early") - EARLY, - - @Description("The observation value should be treated with care.") - @EnumeratedCodeValue("questionable") - QUESTIONABLE, - - @Description("The result has been generated while calibration is occurring.") - @EnumeratedCodeValue("calibrating") - CALIBRATING, - - @Description("The observation could not be completed because of an error.") - @EnumeratedCodeValue("error") - ERROR, - - @Description("No observation value was available.") - @EnumeratedCodeValue("unknown") - UNKNOWN - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationStatusEnum.java deleted file mode 100644 index 63ace8b796c..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ObservationStatusEnum.java +++ /dev/null @@ -1,36 +0,0 @@ -package ca.uhn.fhir.model.enm; - -import ca.uhn.fhir.model.api.ICodeEnum; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.EnumeratedCodeValue; -import ca.uhn.fhir.model.api.annotation.CodeTableDef; - -@CodeTableDef(tableId=7, name="observation-status") -public enum ObservationStatusEnum implements ICodeEnum { - - @Description("The existence of the observation is registered, but there is no result yet available") - @EnumeratedCodeValue("registered") - REGISTERED, - - @Description("This is an initial or interim observation: data may be incomplete or unverified") - @EnumeratedCodeValue("interim") - INTERIM, - - @Description("The observation is complete and verified by an authorised person") - @EnumeratedCodeValue("final") - FINAL, - - @Description("The observation has been modified subsequent to being Final, and is complete and verified by an authorised person") - @EnumeratedCodeValue("amended") - AMENDED, - - @Description("The observation is unavailable because the measurement was not started or not completed (also sometimes called \"aborted\")") - @EnumeratedCodeValue("cancelled") - CANCELLED, - - @Description("The observation has been withdrawn following previous Final release") - @EnumeratedCodeValue("withdrawn") - WITHDRAWN - - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/QuantityComparatorEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/QuantityComparatorEnum.java deleted file mode 100644 index a74ee352234..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/QuantityComparatorEnum.java +++ /dev/null @@ -1,27 +0,0 @@ -package ca.uhn.fhir.model.enm; - -import ca.uhn.fhir.model.api.ICodeEnum; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.EnumeratedCodeValue; -import ca.uhn.fhir.model.api.annotation.CodeTableDef; - -@CodeTableDef(tableId=14, name="quantity-comparator") -public enum QuantityComparatorEnum implements ICodeEnum { - - @EnumeratedCodeValue("<") - @Description("The actual value is less than the given value.") - LESSTHAN, - - @EnumeratedCodeValue("<=") - @Description("The actual value is less than or equal to the given value.") - LESSTHAN_OR_EQUAL, - - @EnumeratedCodeValue(">=") - @Description("The actual value is greater than or equal to the given value.") - GREATERTHAN_OR_EQUAL, - - @EnumeratedCodeValue(">") - @Description("The actual value is greater than the given value.") - GREATERTHAN; - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ReferenceRangeMeaningEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ReferenceRangeMeaningEnum.java deleted file mode 100644 index 3a1ae3e9f47..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/enm/ReferenceRangeMeaningEnum.java +++ /dev/null @@ -1,55 +0,0 @@ -package ca.uhn.fhir.model.enm; - -import ca.uhn.fhir.model.api.ICodeEnum; -import ca.uhn.fhir.model.api.annotation.CodeTableDef; -import ca.uhn.fhir.model.api.annotation.Description; -import ca.uhn.fhir.model.api.annotation.EnumeratedCodeValue; - -@CodeTableDef(tableId = 119, name = "referencerange-meaning") -public enum ReferenceRangeMeaningEnum implements ICodeEnum { - - @EnumeratedCodeValue(value = "normal", system = "http://hl7.org/fhir/referencerange-meaning") - @Description("Normal Range") - NORMAL, - - @EnumeratedCodeValue(value = "recommended", system = "http://hl7.org/fhir/referencerange-meaning") - @Description("Recommended Range") - RECOMMENDED, - - @EnumeratedCodeValue(value = "treatment", system = "http://hl7.org/fhir/referencerange-meaning") - @Description("Treatment Range") - TREATMENT, - - @EnumeratedCodeValue(value = "therapeutic", system = "http://hl7.org/fhir/referencerange-meaning") - @Description("Therapeutic Desired Level") - THERAPEUTIC, - - @EnumeratedCodeValue(value = "pre", system = "http://hl7.org/fhir/referencerange-meaning") - @Description("Pre Therapeutic Desired Level") - PRE, - - @EnumeratedCodeValue(value = "post", system = "http://hl7.org/fhir/referencerange-meaning") - @Description("Post Therapeutic Desired Level") - POST, - - @EnumeratedCodeValue(value = "pre-puberty", system = "http://hl7.org/fhir/referencerange-meaning") - @Description("Pre-Puberty") - PRE_PUBERTY, - - @EnumeratedCodeValue(value = "follicular", system = "http://hl7.org/fhir/referencerange-meaning") - @Description("Follicular Stage") - FOLLICULAR, - - @EnumeratedCodeValue(value = "midcycle", system = "http://hl7.org/fhir/referencerange-meaning") - @Description("MidCycle") - MIDCYCLE, - - @EnumeratedCodeValue(value = "luteal", system = "http://hl7.org/fhir/referencerange-meaning") - @Description("Luteal") - LUTEAL, - - @EnumeratedCodeValue(value = "postmenopausal", system = "http://hl7.org/fhir/referencerange-meaning") - @Description("Post-Menopause") - POSTMENOPAUSAL - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/Constants.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/Constants.java similarity index 84% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/Constants.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/Constants.java index a3727ab494e..97046701708 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/Constants.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/Constants.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws; +package ca.uhn.fhir.server; public class Constants { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/EncodingUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/EncodingUtil.java similarity index 61% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/EncodingUtil.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/EncodingUtil.java index 317e88027ca..734249c9451 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/EncodingUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/EncodingUtil.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws; +package ca.uhn.fhir.server; public enum EncodingUtil { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/IResourceProvider.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/IResourceProvider.java similarity index 94% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/IResourceProvider.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/IResourceProvider.java index 7b96840312b..e7696f8926a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/IResourceProvider.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/IResourceProvider.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws; +package ca.uhn.fhir.server; import ca.uhn.fhir.model.api.IResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/Parameter.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/Parameter.java similarity index 94% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/Parameter.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/Parameter.java index 3338a031e7c..b6e4857df0f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/Parameter.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/Parameter.java @@ -1,8 +1,8 @@ -package ca.uhn.fhir.ws; +package ca.uhn.fhir.server; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.ws.exceptions.InternalErrorException; +import ca.uhn.fhir.server.exceptions.InternalErrorException; /** * Created by dsotnikov on 2/25/2014. diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/Resource.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/Resource.java similarity index 98% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/Resource.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/Resource.java index b3b73cae414..733d1ed4a72 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/Resource.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/Resource.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws; +package ca.uhn.fhir.server; import java.util.ArrayList; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/ResourceMethod.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/ResourceMethod.java similarity index 94% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/ResourceMethod.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/ResourceMethod.java index 4d18fd1e801..eed1c27236f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/ResourceMethod.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/ResourceMethod.java @@ -1,9 +1,9 @@ -package ca.uhn.fhir.ws; +package ca.uhn.fhir.server; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.ws.exceptions.InternalErrorException; -import ca.uhn.fhir.ws.exceptions.InvalidRequestException; -import ca.uhn.fhir.ws.exceptions.MethodNotFoundException; +import ca.uhn.fhir.server.exceptions.InternalErrorException; +import ca.uhn.fhir.server.exceptions.InvalidRequestException; +import ca.uhn.fhir.server.exceptions.MethodNotFoundException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/RestfulServer.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/RestfulServer.java similarity index 95% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/RestfulServer.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/RestfulServer.java index 6c1f5b6d1d7..d46633c2e03 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/RestfulServer.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/RestfulServer.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws; +package ca.uhn.fhir.server; import java.io.File; import java.io.IOException; @@ -26,14 +26,14 @@ import ca.uhn.fhir.model.api.Bundle; import ca.uhn.fhir.model.api.BundleEntry; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.parser.XmlParser; -import ca.uhn.fhir.ws.exceptions.AbstractResponseException; -import ca.uhn.fhir.ws.exceptions.InternalErrorException; -import ca.uhn.fhir.ws.exceptions.MethodNotFoundException; -import ca.uhn.fhir.ws.exceptions.ResourceNotFoundException; -import ca.uhn.fhir.ws.operations.DELETE; -import ca.uhn.fhir.ws.operations.GET; -import ca.uhn.fhir.ws.operations.POST; -import ca.uhn.fhir.ws.operations.PUT; +import ca.uhn.fhir.server.exceptions.AbstractResponseException; +import ca.uhn.fhir.server.exceptions.InternalErrorException; +import ca.uhn.fhir.server.exceptions.MethodNotFoundException; +import ca.uhn.fhir.server.exceptions.ResourceNotFoundException; +import ca.uhn.fhir.server.operations.DELETE; +import ca.uhn.fhir.server.operations.GET; +import ca.uhn.fhir.server.operations.POST; +import ca.uhn.fhir.server.operations.PUT; public abstract class RestfulServer extends HttpServlet { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/Util.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/Util.java similarity index 94% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/Util.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/Util.java index ad3491358d8..9994218e486 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/Util.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/Util.java @@ -1,7 +1,7 @@ -package ca.uhn.fhir.ws; +package ca.uhn.fhir.server; -import ca.uhn.fhir.ws.parameters.Optional; -import ca.uhn.fhir.ws.parameters.Required; +import ca.uhn.fhir.server.parameters.Optional; +import ca.uhn.fhir.server.parameters.Required; import java.io.UnsupportedEncodingException; import java.lang.annotation.Annotation; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/AbstractResponseException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/AbstractResponseException.java similarity index 95% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/AbstractResponseException.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/AbstractResponseException.java index 15335e0f2b3..7ed24bb3d2e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/AbstractResponseException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/AbstractResponseException.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws.exceptions; +package ca.uhn.fhir.server.exceptions; public abstract class AbstractResponseException extends Exception { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/ConfigurationException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/ConfigurationException.java similarity index 80% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/ConfigurationException.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/ConfigurationException.java index 730551d7cc1..2fd7ab362cb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/ConfigurationException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/ConfigurationException.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws.exceptions; +package ca.uhn.fhir.server.exceptions; import javax.servlet.ServletException; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/InternalErrorException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/InternalErrorException.java similarity index 88% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/InternalErrorException.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/InternalErrorException.java index 9e447200788..bf962a838f7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/InternalErrorException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/InternalErrorException.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws.exceptions; +package ca.uhn.fhir.server.exceptions; public class InternalErrorException extends AbstractResponseException { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/InvalidRequestException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/InvalidRequestException.java similarity index 84% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/InvalidRequestException.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/InvalidRequestException.java index 59483043811..135c18fcc08 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/InvalidRequestException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/InvalidRequestException.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws.exceptions; +package ca.uhn.fhir.server.exceptions; public class InvalidRequestException extends AbstractResponseException { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/MethodNotFoundException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/MethodNotFoundException.java similarity index 86% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/MethodNotFoundException.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/MethodNotFoundException.java index 5176cc15472..1a3ec810c87 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/MethodNotFoundException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/MethodNotFoundException.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws.exceptions; +package ca.uhn.fhir.server.exceptions; /** * Created by dsotnikov on 2/27/2014. diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/ResourceNotFoundException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/ResourceNotFoundException.java similarity index 85% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/ResourceNotFoundException.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/ResourceNotFoundException.java index 76ca4c1032a..f5e25aaf9f6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/exceptions/ResourceNotFoundException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/exceptions/ResourceNotFoundException.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws.exceptions; +package ca.uhn.fhir.server.exceptions; public class ResourceNotFoundException extends AbstractResponseException { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/operations/DELETE.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/operations/DELETE.java similarity index 79% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/operations/DELETE.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/operations/DELETE.java index 4fbbfa25981..9b5a2f9270a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/operations/DELETE.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/operations/DELETE.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws.operations; +package ca.uhn.fhir.server.operations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/operations/GET.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/operations/GET.java similarity index 79% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/operations/GET.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/operations/GET.java index e138944ac3c..3c9a1fe2b7e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/operations/GET.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/operations/GET.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws.operations; +package ca.uhn.fhir.server.operations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/operations/POST.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/operations/POST.java similarity index 79% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/operations/POST.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/operations/POST.java index 69eb1725590..d55143a5fc8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/operations/POST.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/operations/POST.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws.operations; +package ca.uhn.fhir.server.operations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/operations/PUT.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/operations/PUT.java similarity index 79% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/operations/PUT.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/operations/PUT.java index 6a6962f9cec..cf4098dfbb2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/operations/PUT.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/operations/PUT.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws.operations; +package ca.uhn.fhir.server.operations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/parameters/Optional.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/parameters/Optional.java similarity index 81% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/parameters/Optional.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/parameters/Optional.java index 53fd051fea8..66f775fdd43 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/parameters/Optional.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/parameters/Optional.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws.parameters; +package ca.uhn.fhir.server.parameters; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/parameters/Required.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/parameters/Required.java similarity index 81% rename from hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/parameters/Required.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/server/parameters/Required.java index abbf736219a..a33615236cc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/ws/parameters/Required.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/server/parameters/Required.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws.parameters; +package ca.uhn.fhir.server.parameters; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/ws/DummyPatientResourceProvider.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/server/DummyPatientResourceProvider.java similarity index 93% rename from hapi-fhir-base/src/test/java/ca/uhn/fhir/ws/DummyPatientResourceProvider.java rename to hapi-fhir-base/src/test/java/ca/uhn/fhir/server/DummyPatientResourceProvider.java index 782f753b479..563d6f2247b 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/ws/DummyPatientResourceProvider.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/server/DummyPatientResourceProvider.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws; +package ca.uhn.fhir.server; import java.util.HashMap; import java.util.Map; @@ -9,8 +9,9 @@ import ca.uhn.fhir.model.dstu.composite.IdentifierDt; import ca.uhn.fhir.model.dstu.resource.Patient; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.UriDt; -import ca.uhn.fhir.ws.operations.GET; -import ca.uhn.fhir.ws.parameters.Required; +import ca.uhn.fhir.server.IResourceProvider; +import ca.uhn.fhir.server.operations.GET; +import ca.uhn.fhir.server.parameters.Required; /** * Created by dsotnikov on 2/25/2014. diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/ws/DummyRestfulServer.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/server/DummyRestfulServer.java similarity index 80% rename from hapi-fhir-base/src/test/java/ca/uhn/fhir/ws/DummyRestfulServer.java rename to hapi-fhir-base/src/test/java/ca/uhn/fhir/server/DummyRestfulServer.java index f3fea5bf562..478f682e61c 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/ws/DummyRestfulServer.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/server/DummyRestfulServer.java @@ -1,8 +1,11 @@ -package ca.uhn.fhir.ws; +package ca.uhn.fhir.server; import java.util.Arrays; import java.util.Collection; +import ca.uhn.fhir.server.IResourceProvider; +import ca.uhn.fhir.server.RestfulServer; + public class DummyRestfulServer extends RestfulServer { private static final long serialVersionUID = 1L; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/ws/ResfulServerTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/server/ResfulServerTest.java similarity index 98% rename from hapi-fhir-base/src/test/java/ca/uhn/fhir/ws/ResfulServerTest.java rename to hapi-fhir-base/src/test/java/ca/uhn/fhir/server/ResfulServerTest.java index 127557847b2..022d25f7194 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/ws/ResfulServerTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/server/ResfulServerTest.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws; +package ca.uhn.fhir.server; import static org.junit.Assert.*; @@ -91,7 +91,7 @@ public class ResfulServerTest { HttpResponse status = ourClient.execute(httpGet); String responseContent = IOUtils.toString(status.getEntity().getContent()); - ourLog.debug("Response was:\n{}", responseContent); + ourLog.info("Response was:\n{}", responseContent); assertEquals(200, status.getStatusLine().getStatusCode()); Patient patient = (Patient) ourCtx.newXmlParser().parseResource(responseContent); diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/ws/ResourceMethodTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/server/ResourceMethodTest.java similarity index 96% rename from hapi-fhir-base/src/test/java/ca/uhn/fhir/ws/ResourceMethodTest.java rename to hapi-fhir-base/src/test/java/ca/uhn/fhir/server/ResourceMethodTest.java index 948035b53d4..869ef6e26fe 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/ws/ResourceMethodTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/server/ResourceMethodTest.java @@ -1,4 +1,4 @@ -package ca.uhn.fhir.ws; +package ca.uhn.fhir.server; import static org.junit.Assert.*; @@ -9,6 +9,9 @@ import java.util.Set; import org.junit.Test; +import ca.uhn.fhir.server.Parameter; +import ca.uhn.fhir.server.ResourceMethod; + public class ResourceMethodTest { @Test diff --git a/hapi-fhir-structures-dstu/.classpath b/hapi-fhir-structures-dstu/.classpath new file mode 100644 index 00000000000..b4ebddcb96a --- /dev/null +++ b/hapi-fhir-structures-dstu/.classpath @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/hapi-fhir-structures-dstu/.gitignore b/hapi-fhir-structures-dstu/.gitignore new file mode 100644 index 00000000000..211297c90f9 --- /dev/null +++ b/hapi-fhir-structures-dstu/.gitignore @@ -0,0 +1,4 @@ +/bin +/target +*.log +*.log* diff --git a/hapi-fhir-structures-dstu/.project b/hapi-fhir-structures-dstu/.project new file mode 100644 index 00000000000..89992b4c221 --- /dev/null +++ b/hapi-fhir-structures-dstu/.project @@ -0,0 +1,14 @@ + + + hapi-fhir-structures-dstu + NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.jdt.core.javanature + + \ No newline at end of file diff --git a/hapi-fhir-structures-dstu/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-structures-dstu/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..9e8b9a32b1a --- /dev/null +++ b/hapi-fhir-structures-dstu/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +#Tue Mar 04 18:10:08 EST 2014 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 diff --git a/hapi-fhir-structures-dstu/pom.xml b/hapi-fhir-structures-dstu/pom.xml index bfd9d897e7f..c8810670385 100644 --- a/hapi-fhir-structures-dstu/pom.xml +++ b/hapi-fhir-structures-dstu/pom.xml @@ -10,7 +10,7 @@ ca.uhn.hapi.fhir - hapi-tinder-test + hapi-fhir-structures-dstu jar HAPI FHIR Structures - DSTU (FHIR 0.80) @@ -39,16 +39,34 @@ ca.uhn.fhir.model.dstu - patient - valueset - organization device + group location + medication + observation + organization + patient practitioner + profile + specimen + substance + valueset + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven_javadoc_plugin_version} + + + + + + diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml index 70eb6548b3f..79276d9ef6d 100644 --- a/hapi-tinder-plugin/pom.xml +++ b/hapi-tinder-plugin/pom.xml @@ -99,6 +99,24 @@ + + org.apache.maven.plugins + maven-plugin-plugin + 3.2 + + + true + + + + + mojo-descriptor + + descriptor + + + +