diff --git a/.gitignore b/.gitignore
index d3ee296ebcb..491a273dcfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,13 @@
/bin
/target
+target/
+.idea/
+.project/
+.settings/
+.metadata/
+RemoteSystemsTempFiles/
+Servers/
+*.iml
*.log
*.log*
nohup.out
diff --git a/hapi-deployable-pom/.project b/hapi-deployable-pom/.project
new file mode 100644
index 00000000000..4b06e2a7715
--- /dev/null
+++ b/hapi-deployable-pom/.project
@@ -0,0 +1,17 @@
+
+
+ hapi-deployable-pom
+
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.m2e.core.maven2Nature
+
+
diff --git a/hapi-deployable-pom/pom.xml b/hapi-deployable-pom/pom.xml
new file mode 100644
index 00000000000..8d4332ff500
--- /dev/null
+++ b/hapi-deployable-pom/pom.xml
@@ -0,0 +1,115 @@
+
+ 4.0.0
+
+
+ ca.uhn.hapi.fhir
+ hapi-fhir
+ 0.8-SNAPSHOT
+ ../pom.xml
+
+
+ hapi-deployable-pom
+ pom
+
+ HAPI FHIR - Deployable Artifact Parent POM
+
+
+
+
+ org.apache.maven.plugins
+ maven-project-info-reports-plugin
+ 2.7
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ ${maven_javadoc_plugin_version}
+
+
+ default
+
+ javadoc
+
+
+
+ http://docs.oracle.com/javaee/7/api
+
+
+
+
+
+
+
+
+
+
+ DIST
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ true
+
+ 128m
+ 1g
+ true
+ false
+ false
+
+
+
+ package
+
+ jar
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ ${maven_source_plugin_version}
+
+
+ package
+
+ jar-no-fork
+
+
+
+
+
+ org.codehaus.mojo
+ license-maven-plugin
+ ${maven_license_plugin_version}
+
+
+ first
+
+ update-file-header
+
+ process-sources
+
+ apache_v2
+ true
+ true
+
+ src/main/java
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hapi-fhir-base/.gitignore b/hapi-fhir-base/.gitignore
index 4dc009173e3..f7e179f26d2 100644
--- a/hapi-fhir-base/.gitignore
+++ b/hapi-fhir-base/.gitignore
@@ -1,2 +1,3 @@
/target
/bin
+/target/
diff --git a/hapi-fhir-base/examples/pom.xml b/hapi-fhir-base/examples/pom.xml
index 0f63e05510a..d20bcfb8574 100644
--- a/hapi-fhir-base/examples/pom.xml
+++ b/hapi-fhir-base/examples/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 0.7
+ 0.8-SNAPSHOT
../../pom.xml
@@ -17,7 +17,12 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 0.7
+ 0.8-SNAPSHOT
+
+
+ ca.uhn.hapi.fhir
+ hapi-fhir-structures-dstu
+ 0.8-SNAPSHOT
javax.servlet
diff --git a/hapi-fhir-base/examples/pom.xml.orig b/hapi-fhir-base/examples/pom.xml.orig
new file mode 100644
index 00000000000..09ea3151fb1
--- /dev/null
+++ b/hapi-fhir-base/examples/pom.xml.orig
@@ -0,0 +1,55 @@
+
+ 4.0.0
+
+
+ ca.uhn.hapi.fhir
+ hapi-fhir
+ 0.8-SNAPSHOT
+ ../../pom.xml
+
+
+ hapi-fhir-base-examples
+ jar
+
+ HAPI FHIR - Examples (for site)
+
+
+
+ ca.uhn.hapi.fhir
+ hapi-fhir-base
+ 0.8-SNAPSHOT
+<<<<<<< HEAD
+=======
+
+
+ ca.uhn.hapi.fhir
+ hapi-fhir-structures-dstu
+ 0.8-SNAPSHOT
+>>>>>>> versions
+
+
+ javax.servlet
+ javax.servlet-api
+ 3.1.0
+ provided
+
+
+ junit
+ junit
+ ${junit_version}
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+
+ true
+
+
+
+
+
+
diff --git a/hapi-fhir-base/examples/src/main/java/example/GenericClientExample.java b/hapi-fhir-base/examples/src/main/java/example/GenericClientExample.java
index 08d82b1a6bd..6d6df92d50b 100644
--- a/hapi-fhir-base/examples/src/main/java/example/GenericClientExample.java
+++ b/hapi-fhir-base/examples/src/main/java/example/GenericClientExample.java
@@ -6,6 +6,8 @@ import java.util.List;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.model.api.Bundle;
import ca.uhn.fhir.model.api.IResource;
+import ca.uhn.fhir.model.base.resource.BaseConformance;
+import ca.uhn.fhir.model.base.resource.BaseOperationOutcome;
import ca.uhn.fhir.model.dstu.resource.Conformance;
import ca.uhn.fhir.model.dstu.resource.Observation;
import ca.uhn.fhir.model.dstu.resource.OperationOutcome;
@@ -82,19 +84,19 @@ public class GenericClientExample {
// START SNIPPET: conformance
// Retrieve the server's conformance statement and print its
// description
- Conformance conf = client.conformance();
- System.out.println(conf.getDescription().getValue());
+ BaseConformance conf = client.conformance();
+ System.out.println(conf.getDescriptionElement().getValue());
// END SNIPPET: conformance
}
{
// START SNIPPET: delete
// Retrieve the server's conformance statement and print its
// description
- OperationOutcome outcome = client.delete().resourceById(new IdDt("Patient", "1234")).execute();
+ BaseOperationOutcome outcome = client.delete().resourceById(new IdDt("Patient", "1234")).execute();
// outcome may be null if the server didn't return one
if (outcome != null) {
- System.out.println(outcome.getIssueFirstRep().getDetails().getValue());
+ System.out.println(outcome.getIssueFirstRep().getDetailsElement().getValue());
}
// END SNIPPET: delete
}
diff --git a/hapi-fhir-base/examples/src/main/java/example/RestfulPatientResourceProviderMore.java b/hapi-fhir-base/examples/src/main/java/example/RestfulPatientResourceProviderMore.java
index ce1b6884786..f454c958fbf 100644
--- a/hapi-fhir-base/examples/src/main/java/example/RestfulPatientResourceProviderMore.java
+++ b/hapi-fhir-base/examples/src/main/java/example/RestfulPatientResourceProviderMore.java
@@ -19,6 +19,7 @@ import ca.uhn.fhir.model.api.Tag;
import ca.uhn.fhir.model.api.TagList;
import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
import ca.uhn.fhir.model.api.annotation.Description;
+import ca.uhn.fhir.model.base.composite.BaseCodingDt;
import ca.uhn.fhir.rest.annotation.TagListParam;
import ca.uhn.fhir.model.dstu.composite.CodingDt;
import ca.uhn.fhir.model.dstu.resource.Conformance;
@@ -430,7 +431,7 @@ public List searchByObservationNames(
// The list here will contain 0..* codings, and any observations which match any of the
// given codings should be returned
- List wantedCodings = theCodings.getListAsCodings();
+ List wantedCodings = theCodings.getListAsCodings();
List retVal = new ArrayList();
// ...populate...
diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml
index 9d358eb4822..a206b79e09f 100644
--- a/hapi-fhir-base/pom.xml
+++ b/hapi-fhir-base/pom.xml
@@ -3,9 +3,9 @@
ca.uhn.hapi.fhir
- hapi-fhir
- 0.7
- ../pom.xml
+ hapi-deployable-pom
+ 0.8-SNAPSHOT
+ ../hapi-deployable-pom/pom.xml
hapi-fhir-base
@@ -178,7 +178,7 @@
javax.servlet
javax.servlet-api
- 3.1.0
+ ${servlet_api_version}
provided
@@ -189,395 +189,16 @@
${junit_version}
test
-
- xmlunit
- xmlunit
- 1.5
- test
-
-
- org.eclipse.jetty
- jetty-servlets
- 9.1.1.v20140108
- test
-
-
- org.eclipse.jetty
- jetty-servlet
- 9.1.1.v20140108
- test
-
-
- org.eclipse.jetty
- jetty-server
- 9.1.1.v20140108
- test
-
-
- org.eclipse.jetty
- jetty-servlet
- 9.1.1.v20140108
- test
-
-
- org.eclipse.jetty
- jetty-util
- 9.1.1.v20140108
- test
-
-
- org.eclipse.jetty
- jetty-webapp
- 9.1.1.v20140108
- test
-
-
- org.eclipse.jetty
- jetty-http
- 9.1.1.v20140108
- test
-
-
-
-
- org.mockito
- mockito-all
- 1.9.5
- test
-
-
- net.sf.json-lib
- json-lib
- 2.4
- jdk15
- test
-
-
- commons-logging
- commons-logging
-
-
-
-
- net.sf.json-lib
- json-lib
- 2.4
- jdk15-sources
- test
-
-
- directory-naming
- naming-java
- 0.8
- test
-
-
- commons-logging
- commons-logging
-
-
-
-
- org.hamcrest
- hamcrest-all
- ${hamcrest_version}
- test
-
-
- com.google.guava
- guava
- ${guava_version}
- test
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-changes-plugin
- 2.10
- false
-
-
-
- changes-report
-
-
-
-
- atom_1.0
-
- http://sourceforge.net/support/tracker.php?aid=%ISSUE%
- https://sourceforge.net/p/hl7api/bugs/%ISSUE%/
- https://sourceforge.net/p/hl7api/feature-requests/%ISSUE%/
-
- false
-
-
-
- org.apache.maven.plugins
- maven-project-info-reports-plugin
- 2.7
-
-
-
- project-team
- issue-tracking
- license
- scm
-
-
-
-
-
-
-
-
-
- UTF-8
- ${user.home}/sites/hapi-fhir
- ${user.home}/sites/scm/hapi-fhir
-
-
-
-
-
- maven-site-plugin
- ${maven_site_plugin_version}
-
- false
- true
-
-
-
- org.apache.maven.wagon
- wagon-scm
- 2.2
-
-
- org.apache.maven.scm
- maven-scm-manager-plexus
- 1.9
-
-
- org.apache.maven.scm
- maven-scm-provider-gitexe
- 1.9
-
-
- org.apache.maven.scm
- maven-scm-api
- 1.9
-
-
-
-
-
-
-
- maven-antrun-plugin
- 1.7
-
-
- addSyntaxHighlighter
- site
-
- run
-
-
-
- Adding Syntax Highlighter
-
-
- ]]>
-
- var elements = document.getElementsByClassName("source");
- for (var i=0; i < elements.length; i++) {
- var pres = elements[i].getElementsByTagName("pre");
- for (var j = 0; j < pres.length; j++) {
- var pre = pres[j];
- if (pre.innerHTML.match(/\/\*/)) {
- pre.className = 'brush: java';
- } else if (pre.innerHTML.match(/^\/\//)) {
- pre.className = 'brush: java';
- } else if (pre.innerHTML.match(/^\{/)) {
- pre.className = 'brush: jscript';
- } else if (pre.innerHTML.match(/^\#/)) {
- pre.className = 'brush: bash';
- } else if (pre.innerHTML.match(/\<\;\//)) {
- pre.className = 'brush: xml';
- } else {
- pre.className = 'brush: java';
- }
- }
- }
-
- SyntaxHighlighter.all();
-
-