56 Commits

Author SHA1 Message Date
jamesagnew
6a036dabe5 Remove most valuesets out of core 2015-02-14 16:14:52 -05:00
James Agnew
7492b25325 More work on separating versions 2015-02-13 18:01:55 -05:00
James Agnew
86e8103657 More work on splitting out resources to different versions 2015-02-13 14:17:44 -05:00
James Agnew
f4805f83d1 Create DSTU2 project 2015-02-06 15:50:29 -05:00
James Agnew
91f8c3f26f Fix #103 - Don't encode contained resources unless they are actualy
referenced somewhere in the resource body
2015-02-05 12:07:37 -05:00
James Agnew
64944d6d81 JPA Documentation updates 2015-02-05 10:25:18 -05:00
James Agnew
a3be361e40 Add some tests for #82 - Not working, but we have tests at least 2015-01-29 14:37:55 -05:00
James Agnew
6c6685137f Lots of tweaks for DSTU2 support 2015-01-29 11:34:57 -05:00
jamesagnew
c36cbb893d Fix some broken unit tests and do a few documentation updates 2015-01-24 16:17:20 +01:00
jamesagnew
e19e96db28 Fix #88 - Client should check which FHIR version the server implements and fail if it is incorrect for the client 2015-01-24 14:51:47 +01:00
jamesagnew
aa8684c977 Working on #89 - Won't mark it until server is redeployed though 2015-01-24 13:01:32 +01:00
jamesagnew
18acda7be2 Get all of the unit tests passing for DSTU1/DSTU2 split 2015-01-24 01:07:09 +05:30
jamesagnew
96fe70de59 Clean up metadata parsing in XML parser 2015-01-10 13:44:40 -05:00
jamesagnew
6dfb5d03e4 Remove redundant <meta/> element from XML resource encoding 2015-01-10 11:18:42 -05:00
jamesagnew
1063b6cf1e Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-01-09 22:02:56 -05:00
jamesagnew
fb5a775fbd Add support for bundle entry states 2015-01-09 22:02:31 -05:00
James Agnew
8e73705000 Work on Android binary - This commit appears huge because the License
plugin just updated the year on everything to 2015
2015-01-09 16:15:55 -05:00
James Agnew
c786b00950 Add status to bundle entries 2015-01-05 17:57:35 -05:00
James Agnew
6b3d92fde1 Cleaning up JavaDocs to allow building in Java 8 2014-12-30 16:39:38 -05:00
James Agnew
0b44a32910 Fix #69 2014-12-29 17:20:34 -05:00
jamesagnew
c73e867736 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java
2014-12-29 09:35:34 -05:00
jamesagnew
fd8ba68e62 Implementing ETag support 2014-12-29 09:33:36 -05:00
James Agnew
81851f4808 Fix #65 - Correctly parse and encode extensions on non-repeatable
primitive fields
2014-12-23 14:10:53 -05:00
jamesagnew
994e49057d Lots of work on DSTU2 server 2014-12-21 18:13:37 -05:00
jamesagnew
94bef8d254 New structures all included now 2014-12-20 12:28:04 -05:00
James Agnew
9f67bbb9c7 Get structures all added, not current building 2014-12-19 17:56:41 -05:00
jamesagnew
4ca405a8fc Unit tests all pass again, elements in baseresouerce reordered 2014-12-19 09:14:40 -05:00
James Agnew
c5d014e9ee More work on getting unit tests passing for DEV resources 2014-12-18 17:34:33 -05:00
James Agnew
34d3695c6c Branch now builds successfully 2014-12-18 13:40:31 -05:00
jamesagnew
a044eb51d7 Working on binary resources in DEV 2014-12-18 08:21:07 -05:00
jamesagnew
1f3991caf9 Bump version to 0.9-SNAPSHOT 2014-12-17 17:04:10 -05:00
jamesagnew
3963bb68e8 Merge remote-tracking branch 'origin/master' into hl7org_structs
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java
	hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java
2014-12-17 16:08:59 -05:00
jamesagnew
7e8f81293e Tagging and deploying 0.8 2014-12-17 14:22:10 -05:00
James Agnew
2d5293c2ef Merge pull request #63 from wdebeau1/master
Fix for #59
2014-12-17 12:25:07 -05:00
b.debeaubien
4599ec1544 #59 - Even more sorting out profile vs id problem 2014-12-16 13:48:59 -05:00
James Agnew
35b5f90318 Merge remote-tracking branch 'origin/master' into hl7org_structs
Conflicts:
	hapi-fhir-structures-hl7org-dev/.gitignore
2014-12-16 11:32:58 -05:00
b.debeaubien
8865a77227 #59 - More sorting out profile vs id problem 2014-12-16 11:25:57 -05:00
b.debeaubien
d0db838f45 #59 - More sorting out profile vs id problem 2014-12-16 09:25:12 -05:00
jamesagnew
cdfebefa67 Work on #61 - Update resource definitions to latest from DSTU1 and DEV SVN 2014-12-16 08:05:38 -05:00
James Agnew
551ffb43b4 More work on DEV operations 2014-12-15 17:41:24 -05:00
jamesagnew
59ba1c9f7b Almost have unit tests passing 2014-12-14 22:29:15 -05:00
James Agnew
2f7cbeb348 Merge branch 'hl7org_v08' of github.com:jamesagnew/hapi-fhir into hl7org_structs
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
	hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java
2014-12-11 16:07:00 -05:00
jamesagnew
c294e1c064 Begin multi version work 2014-12-01 08:13:32 -05:00
jamesagnew
66bb291e04 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	examples/pom.xml.orig
	hapi-deployable-pom/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/BaseServerResponseException.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java
	hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component
	hapi-fhir-structures-dev/.gitignore
	hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/CustomObservation.java
	hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java
	hapi-tinder-plugin/src/main/resources/vm/resource.vm
	hapi-tinder-plugin/src/main/resources/vm/resource_dstu.vm
	pom.xml
	restful-server-example/.settings/org.eclipse.wst.common.component
	restful-server-example/.settings/org.eclipse.wst.common.component.orig
	src/changes/changes.xml
	src/site/resources/svg/restful-server-interceptors.svg
	src/site/site.xml
2014-11-08 10:58:35 -05:00
jamesagnew
5c9cf8ddf8 More merging cleanup 2014-11-08 10:38:25 -05:00
jamesagnew
d1fb878c55 Merging 2014-11-08 10:36:27 -05:00
James Agnew
ece0e83609 Site updates 2014-10-31 16:09:42 -04:00
James Agnew
103b1ba99f Hopefully fix Windows build issue 2014-10-31 14:30:33 -04:00
James Agnew
567fd1219c Fix conflict between DSTU and DEV 2014-10-31 10:35:12 -04:00
James Agnew
135ba9d9e6 Moving site generation into root project 2014-10-30 13:57:29 -04:00