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

459 Commits

Author SHA1 Message Date
James 2dd26b6367 Version bump to 2.1 2016-11-11 15:16:53 -05:00
James a5d5d3e031 Bump FHR version 2016-11-06 17:34:13 -05:00
James 2a5c26b08b Dependency bump 2016-10-05 05:17:07 -04: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 ddc0abe4ed Update to final STU3 ballot definitions 2016-08-26 07:55:10 -04:00
James Agnew 3e7cd153fd Update DSTU3 definitions to latest 2016-08-05 12:36:41 -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
jamesagnew 32bdd14639 Work on term service 2016-07-02 17:14:36 -04:00
jamesagnew 4a49e5b7f9 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-07-01 14:31:25 -04:00
James Agnew 4a7328231e Fix #365 - Don't label methods as unable to return null when they can 2016-06-08 14:48:55 -07:00
James Agnew 364094d540 Fix build 2016-06-08 14:34:58 -07:00
James Agnew 0a2b4290ed Fix #370 - Validation failure when validating certain STU3 resources 2016-06-08 14:21:18 -07:00
James Agnew 7e57aed5d6 Significant performance enhancements for context startup 2016-06-06 11:15:11 -07:00
James Agnew 9fe9cc1e4c Sync RI and fix tests 2016-05-29 17:52:26 -04:00
James Agnew eb3b656a5f Syn RI - Build still failing :( 2016-05-28 12:53:59 -04:00
James Agnew 3e77d3e37e Add _has support (this is an experimental parameter being tested) 2016-05-10 11:47:30 -04:00
James Agnew 848ad158e2 Remove Remittance resource from DSTU2 2016-05-06 19:52:10 -04:00
jamesagnew dcd32b6127 Correctly handle search parameter target types in JPA 2016-05-03 07:03:44 -04:00
James Agnew c90795ccef Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-05-02 09:03:48 -04:00
jamesagnew 5086145132 Add targets to search parameters 2016-05-02 08:10:43 -04:00
James Agnew 2d81612cd8 Fix #350 - Correct serialization for custom types which have fields 
replacing other fields
 2016-04-28 13:25:20 -04:00
jamesagnew 38e80531bb Bump version to 1.6-SNAPSHOT 2016-04-22 07:05:05 -04:00
jamesagnew 14c9fdfd97 Finish removing Documentation resource, which shouldn't exist 2016-04-20 08:11:44 -04:00
jamesagnew 59c44a3b0b More test fixes 2016-04-17 20:57:27 -04:00
jamesagnew 64f84849d7 Fix a bunch of tests - Still trying to get memory down so Cobertura passes 2016-04-17 19:41:28 -04:00
jamesagnew 846e216c04 Fix tests 2016-04-17 12:58:36 -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
jamesagnew 18b3d0df65 Update to DSTU3 Montreal definitions 2016-04-03 18:14:31 -04:00
James Agnew 20081a419d Fix #320 - Don't generate binding enums for example binding fields on 
resources
 2016-03-25 20:15:01 +01:00
bdenton 7131ef1c7c create tinder Ant task 2016-03-24 13:16:52 -07:00
bdenton 42a9bac809 generate resource related files using external templates 2016-03-24 10:34:54 -07:00
James Agnew 1adfc4b4d9 Fix #315 - Allow declaring of custom types for specific profiles 2016-03-22 11:46:08 +01:00
James Agnew 00ced6a652 Improve performance of _lastUpdated queries in JPA server 2016-03-14 06:31:45 -04:00
James Agnew 8de41ca8b4 Attempting to reduce memory usage during tests 2016-03-06 14:38:18 -05:00
jamesagnew 3fd9f9518a Handle unexpected extensions when parsing using IParserErrorHandler 2016-03-02 06:52:46 -05:00
jamesagnew 1da5855c9c Add Eclipse files to git 2016-02-28 14:02:29 -05:00
James Agnew 7fdbee6f21 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-02-26 18:20:32 -05:00
James Agnew 39f6420066 Start working on compartment support 2016-02-26 18:16:35 -05:00
jamesagnew 4975d212fa Add userdata map to interceptors which can be passed around 2016-02-17 08:05:55 -05:00
jamesagnew 9b304748ad Work on terminology service 2016-02-16 21:29:00 -05:00
jamesagnew c1141eb18f Reorganize how search param prefixes are handled and modelled based on new DSTU2 style prefixes 2016-02-15 10:05:39 -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 32daeb6f58 Switch DSTU2.1 to DSTU3 per FMB's decision 2016-02-01 08:55:58 -05:00
jamesagnew 54d17374b9 Update model and definitions to latest definitions 2016-01-30 11:08:16 -05:00
jamesagnew b7aa4e15b9 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2016-01-05 08:31:24 -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 6ac62a5b46 Merge branch 'master' into hl7org_dstu21 2015-12-15 20:33:31 -05:00
jamesagnew 2fd1357363 More travis 2015-12-14 22:58:47 -05:00
James Agnew 68bb244328 Lots of work on new structures 2015-12-13 22:44:41 -05:00
jamesagnew 0a0daedcfd Still not working DSTU2.1 2015-12-09 22:49:02 -05:00
jamesagnew 310a238a2a More work fixing build 2015-11-29 17:16:55 -05:00
jamesagnew 9b0f2a3a9d Try to fix build more 2015-11-29 15:43:43 -05:00
jamesagnew a977cbc663 Try to fix build 2015-11-29 15:32:04 -05:00
jamesagnew 07078e4ce3 Add GZip support to client and server for client-to-server uploads 2015-11-29 15:03:28 -05:00
jamesagnew d47e0e5e77 Add DSTU2.1 resources 2015-11-29 11:43:09 -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 f2ac8a4767 Define Enums for child concepts 2015-11-09 12:54:42 -05:00
jamesagnew 30ab0203a3 Refactor search capability in JPA out of resource specific module 2015-10-28 08:44:52 -04:00
jamesagnew 60f4c27f5b Fix compile 2015-10-23 08:27:19 -04:00
jamesagnew eeac5e6ac0 Java config almost working 2015-10-16 08:57:07 -04:00
James Agnew febb15b78e Work on java config 2015-10-15 17:21:20 -04:00
jamesagnew 7e2d486d17 Working on java config 2015-10-15 08:27:58 -04:00
jamesagnew b4c86d033e More work on fulltext search and add a failing test for subscriptions 2015-10-09 09:12:41 -04:00
jamesagnew ad868038a8 Work on Lucene searching 2015-10-07 09:01:32 -04:00
James Agnew 9fef4f6bab Allow valueset operations to work against type in JPA 2015-10-06 18:53:09 -04:00
jamesagnew 50c43bdb29 Fix tests 2015-10-06 09:08:25 -04:00
James Agnew c666b9c196 Fix compile issues 2015-10-03 16:11:47 -04:00
James Agnew e7e8f8dd81 Use correct status codes for failed deletes, and support multi delete in 
JPA
 2015-10-02 18:18:54 -04:00
James Agnew 12d95bf43c Support patient and encounter $everything operations at the type level 
in JPA
 2015-10-02 08:09:17 -04:00
James Agnew 9664174b6a Use updated valueset definitions 2015-09-30 16:35:51 -04:00
James Agnew 79047ef6ab Add test for #226 and refactor $everything into DAO 2015-09-28 14:09:15 -04:00
jamesagnew 835abdfbea Fix compile issues 2015-09-24 07:46:35 -04:00
jamesagnew cdc1519a55 Work on subscriptions 2015-09-24 07:01:04 -04:00
jamesagnew f2118df9b8 FIx #225 - Support and/or in JPA on _id and _language params 2015-09-21 21:29:04 -04:00
jamesagnew 04c2cce13f Start working on JPA subscriptions 2015-09-21 09:08:19 -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
jamesagnew b1df85eb37 Validation now working completely in JPA server 2015-09-15 08:27:49 -04:00
jamesagnew c96d5efe1f Work on updating validator 2015-09-14 08:22:43 -04:00
James Agnew c534fb9604 Hopefully tests should pass now - Not using profile datatypes in encoded 
choice names has been a pain!
 2015-09-08 14:00:11 -04:00
jamesagnew 8b20f3a77d Sync to 1.0.0 FHIR definitions 2015-09-03 08:07:43 -04:00
jamesagnew a9f978a8a2 Udate to latest DSTU2 definitions 2015-08-31 08:20:24 -04:00
James Agnew 4032a2674d Force UTF-8 on all sources to hopefully avoid compile issues on Windows 2015-08-28 11:35:12 -04:00
jamesagnew bec43b3fdc Fix tests 2015-08-24 08:29:02 -04:00
jamesagnew 44ac164eca Work on #125 - Support _summary and _elements 2015-08-23 13:29:57 -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 ddc66d3ed0 Add support for $validate-code in JPA server 2015-08-20 14:27:19 -04:00
James Agnew 77f151901a Get coded valuesets working once again for DSTU2 resoruces 2015-08-13 17:58:31 -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 78776a3e79 Write generated structures in UTF-8 2015-08-10 15:59:57 -04:00
James Agnew 24634880db Update for QA version of DSTU2 2015-08-09 11:18:04 -04:00
James Agnew d9d192cc04 Merge branch 'master' into dstu2_final 2015-07-30 22:34:45 -04:00
James Agnew ab2129d651 Implements support for _tag in JPA server and client 2015-07-30 07:47:37 -04:00
jamesagnew e457366ffa Start work on upgrading DSTU2 to QA version 2015-07-25 11:56:47 -04:00
James Agnew 56a4c1b04b Add serialization support and fix build regression 2015-07-21 09:45:53 -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 41283d4ed4 Add $get-resource-counts operation to JPA server 2015-07-17 18:28:47 -04:00
jamesagnew ddbe79cb86 For #126 - Don't use BoundCodeableConcept for empty enums 2015-07-17 08:34:44 -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 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
James Agnew 350028be73 Implement meta operations in client 2015-07-10 17:36:55 -04:00
James Agnew c22aa14d29 Clean up the validation framework and integrate the QuestionnaireAnswers 
validator
 2015-07-10 16:05:40 -04:00
James Agnew 75e9b711a5 Cleanup $everything for Patient and Encounter in JPA 2015-07-09 09:47:28 -04:00
James Agnew ad0c51f600 Rename DAO classes per request from Ismael Sarmento Jr 2015-07-07 17:41:59 -04:00
jamesagnew 8a86ad5e76 Wide sweeping changes to get RI structures working in server mode 2015-07-05 17:14:15 -04:00
jamesagnew da2d4d0497 Stlye issues only 2015-06-24 08:22:05 -04:00
jamesagnew 65e1af4c73 More travis 2015-06-20 18:32:00 -04:00
jamesagnew a27032685a Reduce log verbosity 2015-06-20 14:45:07 -04:00
jamesagnew cadf3eaa95 Reduce log verbosity 2015-06-20 10:23:06 -04:00
James Agnew e8c75c5a45 Add support for _lastUpdated parameter in client and JPA server 2015-06-19 17:46:14 -04:00
James Agnew 6f7ef96b97 Support $validate operation correctly in DSTU2 clients and in testpage 
overlay
 2015-06-16 11:56:30 -04:00
jamesagnew 4ab8871a41 POM cleanup 2015-06-09 08:22:46 -04:00
James Agnew ff6884223e Fix #170 - Better addXXX methods in structures. Also don't incorrectly 
include IDs in client create requests, and add better getLink methods
to the bew Bundle resource structure.
 2015-05-21 15:18:46 -04:00
jamesagnew 0f2976358f Version bump to 1.1-SNAPSHOT with more loggging 2015-05-08 08:54:40 -04:00
jamesagnew a731557516 Merge branch 'hl7org_structs' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-07 21:28:31 -04:00
jamesagnew dfbe2415d1 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs 2015-05-07 21:24:34 -04:00
jamesagnew 924ebf062e Preparing for 1.0 release 2015-05-07 20:51:37 -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 3fe60c3f1b Start syncing changes with SVN 2015-05-01 13:07:47 -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
jamesagnew 1f51c69126 Fix #139 - ContactPointDt fields don't index in JPA module 2015-04-05 16:18:14 -04:00
James Agnew 1bdd2daa8e One last synchronization to DSTU2 2015-04-02 11:37:40 -04:00
James Agnew 25a9c254e3 Sync to DSTU2 again 2015-04-01 16:03:54 -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 0c8f50737f Sync to latest version of DSTU2 2015-03-24 17:19:34 -04:00
James Agnew cffda7539f Work on support for $everything operation 2015-03-23 19:06:14 -04:00
James Agnew e84fdb33b0 Fix up some regressions caused by move to DSTU2 style include paths and 
work on revincludes
 2015-03-22 16:59:10 +01:00
James Agnew 596dd664f9 Switch JPA server to use new include style 2015-03-22 13:04:52 +01:00
James Agnew 394db030fc Work on #126 - Not enabling the fix yet because it causes a regression 
in the auditor module, but that's because the auditor module needs to be
refactored a bit.
 2015-03-19 14:19:25 +01:00
James Agnew 823bb4ed82 Add support for profiles and tags in meta for DSTU2 2015-03-16 17:02:44 -04:00
jamesagnew 43e2cd1653 Version bump to 1.0-SNAPSHOT 2015-03-16 09:06:53 -04:00
jamesagnew 3c6febb668 Preparing for 0.9 release 2015-03-13 08:34:52 -04:00
jamesagnew b68d07b546 Work on operation support in client 2015-03-04 08:44:31 -05:00
James Agnew dae2a810d6 Update resource definitions for DSSTU2 2015-03-02 22:39:53 -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
James Agnew 0f2eb230e7 More work on getting conditional updates working 2015-02-26 17:17:22 -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
mochaholic a4b545ba21 Merged with the latest master snapshot. 2015-02-23 08:49:21 -07:00
James Agnew c03d629333 Fix compile failure 2015-02-23 10:01:39 -05:00
James Agnew 0f01260301 Get extensions working for HL7.org structures 2015-02-20 17:34:13 -05:00
jamesagnew 4f93ab9313 Work on JPA Transaction for DSTU2 2015-02-18 22:23:46 -05:00
jamesagnew 3631160269 Fix build 2015-02-17 13:54:26 -05:00
jamesagnew 7e1f9cfdbf More work on new bundle type 2015-02-17 08:45:40 -05:00
jamesagnew 70aa4e812d Work on build 2015-02-16 23:02:50 -05:00
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 35a2f852fe Start work on decoupling dstu1 structures 2015-02-12 17:32:00 -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 37e2abb4e2 Fix #100 - HAPI failed to initialize in an environment without Woodstox 
on the classpath. Will deploy a new snapshot shortly.
 2015-02-04 14:15:11 -05:00
James Agnew 6b3d92fde1 Cleaning up JavaDocs to allow building in Java 8 2014-12-30 16:39:38 -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
James Agnew c8adab5452 Better logging in JPA 2014-12-23 09:42:16 -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
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
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 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 ebd0f222f4 Remove artifacts from merge 2014-12-13 13:03:38 -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
James Agnew c4c26e482f Fix a compile issue reported by Bill de Beaubien 2014-12-10 10:17:33 -05:00
jamesagnew 23de3c53b7 Merge branch 'issue50' 
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BaseDateTimeDt.java
 2014-11-17 14:41:27 -05:00
lmds1 df2011388c cleanup unintentional changes 2014-11-13 18:43:14 -05:00
lmds1 08ffa55774 tidied up whitespace and imports 2014-11-13 18:40:59 -05:00
lmds1 039e5655a8 Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir 
Conflicts:
	hapi-tinder-plugin/src/main/resources/vm/resource.vm
	hapi-tinder-plugin/src/main/resources/vm/resource_dstu.vm
 2014-11-10 18:17:29 -05:00
jamesagnew 450b270c00 Fix compile issues in previous merge 2014-11-08 11:18:04 -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 d22a35788f Implement handleException on the server interceptor framework, as well 
as some site and documentation enhancements
 2014-11-07 14:26:59 -05:00
lmds1 b227d9ff99 changed iResource to return a String resourcename instead of an enum (to be used for auditing), moved audit classes from base to dstu so they can access dstu classes, updated templates to add new method to generated resources 2014-11-04 17:31:53 -05:00
James Agnew 4e769da4ca Give securityevent a common parent 2014-11-04 13:29:21 -05:00