Commit Graph

4481 Commits

Author SHA1 Message Date
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 3a5d814bb0 Fix compile issue 2014-12-17 17:04:38 -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 5b71441401 Eclipse file 2014-12-17 16:06:10 -05:00
jamesagnew 7e8f81293e Tagging and deploying 0.8 2014-12-17 14:22:10 -05:00
jamesagnew a46183ddb8 Add some documentation for #59 2014-12-17 12:40:22 -05:00
James Agnew 2d5293c2ef Merge pull request #63 from wdebeau1/master
Fix for #59
2014-12-17 12:25:07 -05:00
James Agnew 8e6bb6333f Unit tests 2014-12-16 16:27:00 -05:00
b.debeaubien 2d680b1c33 #59 - Even more sorting out profile vs id problem 2014-12-16 15:09:55 -05:00
b.debeaubien 4599ec1544 #59 - Even more sorting out profile vs id problem 2014-12-16 13:48:59 -05:00
James Agnew 3b5d4bfe52 Fix accidental failed unit tests from #60 2014-12-16 11:55:45 -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
James Agnew 326aa515a9 Fix #60 - Client did not correctly send charset declaration as a part of
content-type header on POST/PUT requests
2014-12-16 11:09:26 -05:00
James Agnew c10f501fdc Fix #62 - JPA server failed to correctly process _include when included
resources have a non-numeric ID
2014-12-16 10:38:18 -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
jamesagnew ebd0f222f4 Remove artifacts from merge 2014-12-13 13:03:38 -05:00
lmds1 6fe4261daf added a check for null resources in auditing interceptor 2014-12-12 17:29:07 -05:00
James Agnew e2aea7d1b2 More merging 2014-12-12 17:18:13 -05:00
b.debeaubien 3358db974c Merge branch 'master' of https://github.com/wdebeau1/hapi-fhir 2014-12-12 11:53:04 -05:00
b.debeaubien 1501b3e278 #59 - Start of sorting out profile vs id problem 2014-12-12 11:52:04 -05:00
b.debeaubien 4122867cc3 Start of sorting out profile vs id problem 2014-12-12 11:42:14 -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 e1aa3f335e Unit tests all pass! 2014-12-10 22:02:31 -05:00
James Agnew d8e14e4213 ...more work on HL7 structs 2014-12-10 17:40:47 -05:00
James Agnew 2f92e3515b Merge remote-tracking branch 'origin/master' into hl7org_structs 2014-12-10 16:11:08 -05:00
James Agnew 3329a0a5c0 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-12-10 15:25:10 -05:00
b.debeaubien da22349b47 Fixed bug in recursive extension scanner caused by the previous fix to the extension scanner 2014-12-10 15:24:54 -05:00
James Agnew 840e004580 Unit test refactor 2014-12-10 15:11:32 -05:00
James Agnew ec8fdc7d68 More work on HL7.org structs 2014-12-10 14:28:25 -05:00
James Agnew 463fe249e6 Merge remote-tracking branch 'origin/master' into hl7org_structs 2014-12-10 11:09:44 -05:00
James Agnew 8ac479b7bd Prevent profile generation issue with multiple resource definition
classes that share an extension
2014-12-10 10:40:29 -05:00
b.debeaubien 84ecec2835 Added test demonstrating that using the same extension in 2 different resources causes the profile extension scanner to throw up its hands in despair 2014-12-10 10:24:04 -05:00
James Agnew c4c26e482f Fix a compile issue reported by Bill de Beaubien 2014-12-10 10:17:33 -05:00
jamesagnew 26e60b1b85 More work on hl7.org structs 2014-12-10 09:25:15 -05:00
jamesagnew cee02ea605 More structures work from hl7 2014-12-09 08:24:35 -05:00
James Agnew 45e48c62bf More structures work 2014-12-05 18:06:25 -05:00
James Agnew c901330583 Fix build failure 2014-12-04 11:41:13 -05:00
James Agnew e3ad2d8a2d Remove unneeded source path 2014-12-04 11:27:53 -05:00
James Agnew 81d842548c Adding tests that don't yet work 2014-12-04 11:21:08 -05:00
James Agnew ecadd83711 Return a better error message if the server finds multiple resource
providers for the same resource type
2014-12-04 11:04:53 -05:00
James Agnew a346219930 Just some work on the structs 2014-12-03 17:41:32 -05:00
James Agnew 29dab8bad9 Messing around with the POM to try and get android working 2014-12-03 17:09:13 -05:00
James Agnew 826fa1d7c1 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex3/Example03_PatientResourceProvider.java
	hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex3/Example03_SimpleRestfulServer.java
	src/changes/changes.xml
2014-12-03 13:49:19 -05:00
James Agnew 3ca9fbbebb Encoding a Binary resource without a content type set should not result
in a NullPointerException.
2014-12-03 13:46:46 -05:00