honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,001 Commits 682 Branches 130 Tags 1.2 GiB
Commit Graph

563 Commits

Author SHA1 Message Date
Sebastien Riviere 13646168f0 Use the profile of the datatype if available, intead of the default hl7.org url 2017-01-19 14:55:42 +01:00
James b448e13edd Version bump to 2.3 2016-12-20 19:01:31 -05:00
James 0ec61533a8 Publish 2.2 2016-12-20 19:00:37 -05:00
James 18e47c2130 More validator tests 2016-12-20 09:30:46 -05:00
James 964919d880 Improve parsing 2016-12-19 14:03:11 -05:00
James ab17ee68a3 Revert IFhirVersion method signature changes for #520 2016-12-11 18:55:59 -05:00
James b0d656e5d9 Refactor fix for #520 a bit so that version in DSTU3 is always pulled 
from the model
 2016-12-10 14:40:27 -05:00
James Agnew 888f42a032 Introduce new CORS interceptor and switch examples to use it 2016-11-21 18:30:51 +01:00
James Agnew 03935be97f Work on common FluentPath interface 2016-11-21 15:52:17 +01:00
James Agnew bf35f7e4b2 Fix #495 - Auto-detect DSTU3 mode when those resources are on classpath 2016-11-21 13:44:54 +01:00
James 2d7592f7a8 Version bump to 2.2-SNAPSHOT 2016-11-11 22:39:45 -05:00
James 2dd26b6367 Version bump to 2.1 2016-11-11 15:16:53 -05:00
James Agnew 906bcfb803 Version bump to 2.1 2016-08-30 10:55:55 -04:00
James Agnew d27aad487e Bump to 2.0 release 2016-08-30 10:50:04 -04:00
James 333aa0afde Correctly update versions on transactipn update 2016-08-28 22:56:59 -04:00
James 779b66c5e4 Add unit test 2016-08-11 20:55:11 -04:00
jamesagnew c193514ff7 Add eclipse files 2016-08-06 15:44:47 -04:00
James Agnew 3e7cd153fd Update DSTU3 definitions to latest 2016-08-05 12:36:41 -04:00
jamesagnew 7dbd5a21ca Fix tests 2016-07-24 09:20:54 -04:00
jamesagnew 196c11bfa2 Use new style mimetypes but keep supportuing the old ones as well 2016-07-17 18:35:06 -04:00
James Agnew 0b69367b11 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-07-13 09:22:19 -04:00
jamesagnew fa37afb61f Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-07-12 21:44:52 -04:00
jamesagnew ed941a116b Update to use GSON 2016-07-12 21:44:40 -04:00
James Agnew c550681aeb Update defs to 1.5.0 versions 2016-07-12 18:29:10 -04:00
James Agnew c3e9f618eb Version bump to 2.0-SNAPSHOT 2016-07-12 11:12:07 -04:00
jamesagnew acaf2135c5 Finalize 1.6 release 2016-07-06 07:29:20 -04:00
James Agnew 1683cf8cef Switch to jacoco 2016-06-15 17:34:50 -04:00
James Agnew e2f1beef2c Fix some tests 2016-06-14 22:03:24 -04:00
James Agnew 7e57aed5d6 Significant performance enhancements for context startup 2016-06-06 11:15:11 -07:00
jamesagnew a2954ef181 Fix build 2016-05-30 06:57:01 -04:00
James Agnew 236dfe586f Fix tests 2016-05-27 10:50:31 -04:00
jamesagnew 35ffbf1568 Sync DSTU2 validator with RI 2016-05-24 09:22:16 -04:00
jamesagnew 514da88787 Improve performance in parser when parsing large bundles 2016-04-23 13:54:16 -04:00
jamesagnew 38e80531bb Bump version to 1.6-SNAPSHOT 2016-04-22 07:05:05 -04:00
jamesagnew 846e216c04 Fix tests 2016-04-17 12:58:36 -04:00
jamesagnew 72640dc720 Correct encoding order for DSTU2 resources 2016-04-14 07:53:37 -04:00
jamesagnew 81dec23faf Correctly populate Bundle.entry.fullUrl on Hl7OrgDstu2 servers 2016-04-14 06:59:43 -04:00
jamesagnew 0780b7e472 Add tests 2016-04-14 06:36:29 -04:00
jamesagnew 2f37015d57 Clean up parsers so that elements are always encoded according to their order in the structures that contain them 2016-04-11 08:36:12 -04:00
James Agnew 1adfc4b4d9 Fix #315 - Allow declaring of custom types for specific profiles 2016-03-22 11:46:08 +01:00
jamesagnew 232afee955 Improved error messages for #305 2016-03-11 07:56:00 -05:00
James Agnew 8de41ca8b4 Attempting to reduce memory usage during tests 2016-03-06 14:38:18 -05:00
jamesagnew 1da5855c9c Add Eclipse files to git 2016-02-28 14:02:29 -05:00
jamesagnew 23f9292b50 Add support for comments in XML and JSON parsing/encoding 2016-02-08 22:05:17 -05:00
James Agnew f21851099c Version bump 2016-02-08 13:59:09 -05:00
James Agnew e0e52f96c6 Version bump to 1.4 (finally!) 2016-02-03 15:25:32 -05:00
jamesagnew 5ef88d0447 Avoid conflict in HL7org-DSTU2 structures 2016-01-21 08:49:26 -05:00
jamesagnew 1ba03f4a9b Fix #283 - Remove servlet 3.0 dependency where possible 2016-01-20 08:11:03 -05:00
James Agnew 589059256f Correct issues uncovered during connectathon 2016-01-11 07:42:13 -05:00
James Agnew c1afb4f54d Get overlay working for DSTU2.1 2016-01-07 15:04:56 -05:00
James Agnew 0fff6018eb Travis 2016-01-07 13:05:57 -05:00
James Agnew ca61ef2e23 More travis 2016-01-07 11:37:33 -05:00
James Agnew 0c8c414784 Try to get travis working 2016-01-07 11:17:54 -05:00
James Agnew 479da24cfb Bump license files 2016-01-07 08:50:07 -05:00
James Agnew 9c5a5dc248 Still more travis 2016-01-06 12:59:45 -05:00
James Agnew eb3f3a0386 Try to get travis passing yet again 2016-01-06 09:56:36 -05:00
jamesagnew 685bd9345b Add request/response validator interceptors 2016-01-03 21:52:11 -05:00
jamesagnew 5789db8743 Remove dependency on cobertura at compile time 2016-01-02 10:55:52 -05:00
jamesagnew d48761a640 Travis failing again 2016-01-02 09:35:18 -05:00
jamesagnew 718a26671f DSTU2.1 structures working 2016-01-01 16:59:19 -05:00
jamesagnew 056900f324 Lots more work on DSTU2.1 structures 2015-12-30 11:27:12 -06:00
jamesagnew 7692e5d714 More work on DSTU2.1 structs 2015-12-22 09:32:06 -05:00
jamesagnew 2469aa3725 Lots of DSTU2.1 structure work 2015-12-20 23:35:47 -05:00
jamesagnew aaf85f2323 Lots of work on DSTU2.1 structures 2015-12-20 09:29:52 -05:00
jamesagnew 3005c9a766 Still working on unit tests 2015-12-15 09:11:01 -05:00
jamesagnew ea89f3af28 Correctly return profile 2015-12-09 07:07:05 -05:00
James Agnew 2f8278ff78 Fix build 2015-12-02 10:10:10 -05:00
James Agnew 547b5290a4 Update resource defs 2015-12-01 18:35:24 -05:00
jamesagnew d47e0e5e77 Add DSTU2.1 resources 2015-11-29 11:43:09 -05:00
jamesagnew e6b47855e6 Merge branch 'master' of git://github.com/petervanhoute/hapi-fhir into petervanhoute-master 2015-11-27 14:59:53 -05:00
James Agnew c78be081ef Add CLI test 2015-11-20 10:30:10 +01:00
James Agnew 1c82a692f6 Try to reduce memory for unit tests 2015-11-16 14:13:34 +01:00
James Agnew e7dda532c6 Tests are failing on Travis but not locally... Argh 2015-11-16 14:00:35 +01:00
James Agnew 18f7e958d2 Debug info for failing test 2015-11-15 20:17:36 -05:00
James Agnew 2f12c9ed01 Bump version to 1.4-SNAPSHOT 2015-11-15 20:11:05 -05:00
James Agnew f9f33f059b Version bump to 1.3 2015-11-15 12:53:02 -05:00
James Agnew 614b7e09e5 Bump to 1.0.2 FHIR definitions 2015-11-15 12:22:56 -05:00
James Agnew d3685e72ba Fix #241 and fix #247 - Don't encode UUID IDs on resources, and preserve 
bundle type when retrieving pages
 2015-10-29 15:38:19 -04:00
jamesagnew c31900b827 JPA performance tweaks: Avoid unneccesary fulltext index pass during transaction and tag lookup 2015-10-25 12:18:21 -04:00
jamesagnew 938a251ae9 Cleanup tests for java config in JPA 2015-10-19 20:19:40 -04:00
James Agnew e9d18af5d9 Bump library versions 2015-10-14 18:11:52 -04:00
James Agnew 8794de7a22 Improve validation messages 2015-10-08 18:31:30 -04:00
petervanhoute 7f910974a2 create seperate response and server interfaces and classes for servlets and jaxrs 2015-10-07 17:11:16 +02:00
James Agnew 43aad1eb98 Properly support chains in JPA conditional URLs 2015-10-04 15:38:58 -04:00
James Agnew aa32e6f0a9 Improve ValueSet operations in JPA 2015-10-02 12:37:56 -04:00
James Agnew 68a5bd3b23 Add tests 2015-09-29 17:04:14 -04:00
James Agnew ca8c257833 Support lastupdate filtering and sorting on JPA everything operation 2015-09-29 13:24:33 -04:00
James Agnew 1cc6a05273 FIx validation for resources using v2 tables 2015-09-29 10:51:36 -04:00
jamesagnew 9492744018 Work on subsciprions 2015-09-28 09:06:57 -04:00
James Agnew 072c1ece87 Send Accept header on client requests, and allow string responses in 
QuestionnaireResponse validator for questions of type OPENCHOICE
 2015-09-24 13:40:07 -04:00
jamesagnew 70e942e9f8 Version bump to 1.3-SNAPSHOT 2015-09-19 11:00:57 -04:00
jamesagnew 31934ff582 Version bump to 1.2 2015-09-16 07:09:03 -04:00
James Agnew 73121e222c Add tests 2015-09-15 14:11:55 -04:00
James Agnew 2961d2e91b POM cleanup 2015-09-15 10:28:09 -04:00
jamesagnew b1df85eb37 Validation now working completely in JPA server 2015-09-15 08:27:49 -04:00
jamesagnew 45d7d9a922 Documentation only 2015-09-14 21:20:16 -04:00
jamesagnew c96d5efe1f Work on updating validator 2015-09-14 08:22:43 -04:00
jamesagnew d0bac3d419 Work on CLI tool 2015-09-13 22:06:31 -04:00
jamesagnew 8120ab2228 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-09-09 22:46:48 -04:00
jamesagnew 437625505c Add some tests and some cleanup of unused code 2015-09-09 22:41:10 -04:00
de Beaubien, Bill 5b64a7f569 #221 and now, with null-checking so the tests don't break... 2015-09-09 17:06:27 -04:00
de Beaubien, Bill b1db2bf2d8 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2015-09-09 16:47:20 -04:00
de Beaubien, Bill 27764da19a #221 Conformance date now defaults to the build date/time 2015-09-09 16:47:07 -04:00
James Agnew 2a3088f2e2 Add tests 2015-09-09 16:08:21 -04:00
jamesagnew aa8334a99a Merge remote-tracking branch 'upstream/master' into osgi-pull-request 2015-09-09 08:41:45 -04:00
bdenton daedf63c46 Decouple RestfulService and ServerConformanceProvider to avoid cycle in 
Spring wiring
 2015-09-09 07:01:03 -04:00
James Agnew 69596abdc9 Once more fixing the build 2015-09-08 10:31:47 -04:00
jamesagnew a733ad0949 Fix build 2015-09-08 08:58:23 -04:00
jamesagnew bb5816d8e9 Fix second part of #216 - Correctly encode choice elements on profiled datatypes 2015-09-08 08:01:51 -04:00
miantorno e3c3600700 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 2015-09-04 09:08:07 -04:00
jamesagnew 773608f860 Validation documentation 2015-09-04 08:22:06 -04:00
miantorno a4d973696e Updating pom.xml files for dstu2. 2015-09-03 14:36:37 -04:00
jamesagnew f3e44eea3b Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-09-03 08:08:13 -04:00
jamesagnew 8b20f3a77d Sync to 1.0.0 FHIR definitions 2015-09-03 08:07:43 -04:00
James Agnew ae177b52e8 Populate Bundle.entry.fullUrl 2015-09-02 13:42:59 -04:00
jamesagnew 64cc5d4659 Bump FHIR version to 1.0.0 2015-09-01 08:56:07 -04:00
James Agnew a6d76cc2ca Remove SLF 1.7 API usage 2015-08-31 10:21:07 -04:00
James Agnew fc36dabc68 Fix build 2015-08-31 09:23:21 -04:00
jamesagnew a9f978a8a2 Udate to latest DSTU2 definitions 2015-08-31 08:20:24 -04:00
James Agnew bd13b53099 Fix #212 - Dont accept invalid IDs but do accept IDs starting with a 
number
 2015-08-28 15:36:56 -04:00
jamesagnew 073fa47807 Add support for _include:recurse behaviour 2015-08-27 19:44:51 -04:00
jamesagnew bec43b3fdc Fix tests 2015-08-24 08:29:02 -04:00
jamesagnew 60339d6f93 Fix #209 - _revinclude results from JPA server should have a Bundle.entry.search.mode of "include" and not "match". Thanks to Josh Mandel for reporting! 2015-08-23 22:25:25 -04:00
jamesagnew 11376024fa Fixing test related to summary and elements mode 2015-08-23 21:51:46 -04:00
jamesagnew 44ac164eca Work on #125 - Support _summary and _elements 2015-08-23 13:29:57 -04:00
jamesagnew 07d654c97b More work on validator 2015-08-21 09:03:48 -04:00
jamesagnew 34d6ae1fc5 Fix bad import 2015-08-20 21:42:35 -04:00
jamesagnew e4b732efe6 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2015-08-20 21:35:34 -04:00
jamesagnew 00931b58a1 Work on validator 2015-08-20 20:42:56 -04:00
James Agnew e20e7d1e67 Fix resource 2015-08-20 17:08:22 -04:00
James Agnew 3901c429df More work on InstanceValidator 2015-08-20 16:17:22 -04:00
James Agnew 7645c240f4 Get instance validator working across FHIR versions 2015-08-20 15:27:24 -04:00
James Agnew 11f5aeebd9 Clean up the build and hopefully close #206 2015-08-19 11:49:00 -04:00
James Agnew bb1e8b9ddd Last commit broke cobertura 2015-08-17 15:54:00 -04:00
jamesagnew ac564a54d6 Documentation cleanup 2015-08-17 07:57:20 -04:00
jamesagnew 330dbde983 Add new interceptor hook for auditing 2015-08-16 22:09:01 -04:00
James Agnew 89a7750bf4 Start working on action interceptor framework 2015-08-14 17:05:07 -04:00
James Agnew 2766af2693 Update definitions and correctly handle exceptions in 
incomingRequestPreProcessed method in server interceptors
 2015-08-13 16:59:10 -04:00
James Agnew 24634880db Update for QA version of DSTU2 2015-08-09 11:18:04 -04:00
James Agnew 215ad9b3dc Fix broken unit test 2015-08-06 11:25:30 -04:00
James Agnew 76c076a2d1 Add test for #205 2015-08-06 11:14:52 -04:00
James Agnew c49941060b More work on QA validator 2015-07-30 19:16:16 -04:00
James Agnew 7988cc3993 More work on QuestionnaireAnswersValidator 2015-07-29 21:31:17 -04:00
James Agnew 27a1d68d5f Documentation updates 2015-07-28 14:47:58 -04:00
James Agnew 8ea0475976 Deal with composed valuesets in QuestionnaireAnswersValidatorf 2015-07-27 11:51:15 -04:00
jamesagnew e9061ef975 Remove eclipse file from git 2015-07-22 07:56:23 -04:00
James Agnew f2bf199ac7 Fix build and sync RI 2015-07-21 10:58:02 -04:00
James Agnew 56a4c1b04b Add serialization support and fix build regression 2015-07-21 09:45:53 -04:00
jamesagnew 99e92d8fca Operations in server generated conformance statement should only appear once per name, since the name needs to be unique. 2015-07-19 19:17:39 -04:00
jamesagnew a774a654ce Property document OperationDefinitions generated automatically by server 2015-07-19 11:10:46 -04:00
jamesagnew 61cb60b293 Operations which are not resource type specific were not showing up in REST server's conformance 2015-07-18 18:44:46 -04:00
jamesagnew a35d20b999 Fix #158 - Don't encode empty tags 2015-07-18 17:35:54 -04:00
jamesagnew 3bff020c54 Add exception pre processing method to server interceptors 2015-07-18 16:31:32 -04:00
jamesagnew 57ee1fe220 Fix unit tests failing due to OperationDefinition changes 2015-07-18 14:43:59 -04:00
jamesagnew 41283d4ed4 Add $get-resource-counts operation to JPA server 2015-07-17 18:28:47 -04:00
jamesagnew 2fc0d4c7a2 Clean up exception handling in server, and add QuestionnaireAnswers validation for JPA server 2015-07-16 20:16:51 -04:00
James Agnew 3bba0c0425 Add validation module for QuestionnaireAnswers 2015-07-15 17:28:12 -04:00
James Agnew 901c5c29cf Version bunp for 1.2 2015-07-14 18:08:06 -04:00
James Agnew 3fa7c54526 Tag 1.1 release 2015-07-13 10:31:02 -04:00
jamesagnew c8ce723a1d DOcumentation updates 2015-07-13 08:16:48 -04:00
James Agnew c22aa14d29 Clean up the validation framework and integrate the QuestionnaireAnswers 
validator
 2015-07-10 16:05:40 -04:00
jamesagnew d5b99c2c10 Fix broken build 2015-07-08 22:27:49 -04:00
James Agnew 3bfecb27a8 Update RI structures 2015-07-08 17:57:53 -04:00
jamesagnew 70222ecf15 More fix build 2015-07-05 17:43:18 -04:00
jamesagnew 8a86ad5e76 Wide sweeping changes to get RI structures working in server mode 2015-07-05 17:14:15 -04:00
James Agnew 70d4abdf06 Server should include lastUpdated in search responses if one is supplied 
by the implementation. Also automatically include in this in JPA server
 2015-06-22 16:27:08 -04:00
jamesagnew 9758f32021 Fix build 2015-06-21 12:22:14 -04:00
jamesagnew b48843a128 More work on test coverage 2015-06-21 12:16:33 -04:00
jamesagnew e9ac63688c Finally have travis and coveralls working! 2015-06-21 00:48:10 -04:00
jamesagnew 71fbfe5214 Add consolidated test package and clean up tests for cobertura 2015-06-20 14:23:34 -04:00
James Agnew 39dd48bc41 Automatically populate Bundle.entry.base when encoding a bunde 2015-06-17 14:32:11 -04:00
James Agnew 6f7ef96b97 Support $validate operation correctly in DSTU2 clients and in testpage 
overlay
 2015-06-16 11:56:30 -04:00
James Agnew 62b0707b36 Support attributes longer than 512kb. 2015-06-04 12:19:10 -04:00
James Agnew 9b97fb0e97 Enable validation ($validate) operation in DSTU2 style 2015-06-04 10:56:13 -04:00
jamesagnew e5b402cb14 Allow raw access to resource body in create/update/etc 2015-06-01 09:21:41 -04:00
jamesagnew 064f113133 Clean up resource parameter handling 2015-05-31 19:38:01 -04:00
jamesagnew 4a5e13b301 Work on synchronizing the HL7.org structures 2015-05-31 16:52:31 -04:00
jamesagnew 11d22b1b1f Site updates and clean up RI IdType 2015-05-28 08:35:49 -04:00
James Agnew ec3c94a823 Update RI structures 2015-05-22 17:32:36 -04:00
James Agnew b89ee3d2a7 Add unit test for JPA 2015-05-22 16:30:14 -04:00
James Agnew 0f9d4b8059 Add interceptor for syntax highlighting 2015-05-15 18:59:54 -04:00
James Agnew 3e382ab760 More work on RI structs 2015-05-08 18:49:31 -04:00
jamesagnew 0f2976358f Version bump to 1.1-SNAPSHOT with more loggging 2015-05-08 08:54:40 -04:00
James Agnew 3a5d2e892a About to commit to SVN as well 2015-05-05 18:16:22 -04:00
James Agnew 05cccdb6e5 More work on structs 2015-05-05 13:16:10 -04:00
James Agnew ae81ad29f6 Unit tests all passing 2015-05-02 14:04:43 -07:00
James Agnew aa2f2cee96 Merge branch 'hl7org_structs' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-01 13:52:24 -07:00
James Agnew 880ab84ce8 More work on structs 2015-05-01 12:27:56 -07:00
James Agnew 3fe60c3f1b Start syncing changes with SVN 2015-05-01 13:07:47 -04:00
James Agnew 629bc5b7d3 HL7org unit tests all pass 2015-05-01 11:09:29 -04:00
jamesagnew 147305b70e More work on getting HL7org structs working 2015-04-22 07:46:33 -04:00
jamesagnew b222b76611 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 
Conflicts:
	hapi-fhir-android/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java
	hapi-fhir-testpage-overlay/.gitignore
	src/changes/changes.xml
 2015-04-21 13:30:58 -04:00
James Agnew b42737262b Work on HL7org structs 2015-04-20 07:31:45 -04:00
James Agnew eddcf5f4d8 Merge branch 'hl7org_structs' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-04-15 16:37:35 -04:00
James Agnew 3db46c2db2 More work on hl7org strfucts 2015-04-15 16:37:24 -04:00
jamesagnew cfff2006ec More work on HL7org structs 2015-04-15 07:49:18 -04:00
jamesagnew 2edc7eadab Work on HL7.org structs 2015-04-13 08:32:49 -04:00
James Agnew c5e75ebe60 Work 2015-04-10 18:14:42 -04:00
jamesagnew b6f2b57ed9 Work on HL7 structs 2015-04-10 08:02:05 -04:00
James Agnew c484425c78 Update license file generation and gitignores 2015-03-26 11:57:07 -04:00
jamesagnew 986094617a Fix #135 - Remove Eclipse and IntelliJ artifacts from version control 2015-03-26 07:56:24 -04:00
James Agnew c6f65b070a Merge pull request #121 from esteban-aliverti/hl7org-dstu2_fix 
Added net.sf.saxon:saxon-he
 2015-03-11 15:51:03 -04:00
esteban-aliverti a5c6091896 Added net.sf.saxon:saxon-he 2015-03-09 08:53:09 +01:00
Andrea Scarpino 7c634219e9 Add missing dependence to structures-hl7org-dstu2 
saxon is used in Utilities.java
 2015-03-05 11:54:07 +01:00
jamesagnew b68d07b546 Work on operation support in client 2015-03-04 08:44:31 -05:00
jamesagnew a81e081798 Work on transaction support for DSTU2 2015-03-01 18:00:06 -05:00
James Agnew db65d5db59 Work on support for new bundle format in DSTU2 2015-02-27 18:09:24 -05:00
jamesagnew 3812260a55 Fix #110 - Support DSTU2 Security Labels, merging in Pull Request from Mohammad Jafari - Merge branch 'master' of https://github.com/mochaholic/hapi-fhir into mochaholic-master 
Conflicts:
	hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/UpdateConditionalTest.java
 2015-02-24 07:49:31 -05:00
mochaholic 64715477bd Merged with the latest master snapshot. 2015-02-23 11:35:27 -07:00
James Agnew 0f01260301 Get extensions working for HL7.org structures 2015-02-20 17:34:13 -05:00
James Agnew dbeb6c09c6 More work on new structures 2015-02-18 17:00:47 -05:00
jamesagnew 70aa4e812d Work on build 2015-02-16 23:02:50 -05:00
jamesagnew 795041a514 More work on struct integration 2015-02-16 11:33:46 -05:00