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

287 Commits

Author SHA1 Message Date
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
lmds1 f366cb52f1 merged changes from master 2014-11-03 17:18:33 -05:00
lmds1 730ff7b21a no changes 2014-11-03 16:04:32 -05:00
James Agnew da6a5d5a24 Move BoundCodeableConceptDt back to where it originally was for DSTU1 
resources
 2014-10-29 16:08:07 -04:00
James Agnew 094a617644 Merge branch 'versions' 
Conflicts:
	hapi-fhir-base/examples/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java
	hapi-fhir-base/testmindeps/pom.xml
	hapi-fhir-jpaserver-uhnfhirtest/pom.xml
	hapi-fhir-testpage-overlay/pom.xml
	hapi-tinder-plugin/pom.xml
	hapi-tinder-test/pom.xml
	restful-server-example-test/pom.xml
	restful-server-example/.settings/org.eclipse.wst.common.component
	restful-server-example/pom.xml
 2014-10-29 15:34:59 -04:00
James Agnew 8f610d2c3a Add some tests 2014-10-29 09:04:44 -04:00
James Agnew c26602f0c8 Versions now builds completely! 2014-10-24 15:43:35 -04:00
jamesagnew 818177f70f Bunp to 0.7 for release 2014-10-23 08:12:58 -04:00
James Agnew 81ddb3f1d5 More versions work 2014-10-20 18:59:02 -04:00
lmds1 45a3fa8254 updated tinder to generate resources with a getResourceType method returning the ResourceTypeEnum, removed Test resource 2014-10-20 14:19:18 -04:00
James Agnew b07b8b9845 Start adding DEV structures 2014-10-17 18:08:37 -04:00
James Agnew 47edfb7b01 Almost have versions tests passing 2014-10-17 14:51:45 -04:00
James Agnew bb0b39627d Unit tests almost all passing 2014-10-16 17:19:27 -04:00
James Agnew 1d29b2b642 Still more versions work 2014-10-16 13:41:57 -04:00
James Agnew 751face0a6 Argh. Fix to 0.7-SNAPSHOT, not 0.6-SNAPSHOT 2014-09-30 13:16:09 -04:00
James Agnew 1feb69b545 Revert to 0.6-SNAPSHOT version 2014-09-30 11:59:38 -04:00
t106uhn 686237f970 bump to 0.8-SNAPSHOT 2014-09-26 20:50:36 -04:00
James Agnew cdd4b137fb Bump to 0.7-SNAPSHOT 2014-09-11 16:57:45 -04:00
jamesagnew 13dd6d5e11 Complete 0.6 2014-09-08 07:41:44 -04:00
James Agnew a8be093b1f Use better valueset enums for SecurityEvent's values 2014-08-28 12:58:13 -04:00
James Agnew c75c37d24d Rename SecurityEvent.Object to SecurityEvent.ObjectElement 2014-08-27 12:01:46 -04:00
jamesagnew 9413bfa47b Correctly parse List resource 2014-08-26 08:10:15 -04:00
jamesagnew d01f43e4b3 Add server interceptor layer as well as starting work on property file for versions 2014-08-25 09:11:28 -04:00
jamesagnew ab17c9f3d1 Let server return profile info if configured to do so 2014-08-21 00:34:19 -04:00
jamesagnew 6bc9140def Fix unit test failure 2014-08-19 09:12:25 -04:00
jamesagnew 9ef670aae9 Start getting sorting into fhirtest 2014-08-12 08:00:24 -04:00
jamesagnew e17af44a09 Add _language search support 2014-08-08 08:34:28 -04:00
James Agnew fa3bd7f25d Start adding OpenID support 2014-07-31 18:06:04 -04:00
James Agnew ef10560c76 Version bump to 0.6-SNAPSHOT 2014-07-30 11:58:06 -04:00
jamesagnew 67fb593146 Finalize 0.5 2014-07-29 22:26:19 -04:00
James Agnew e4ceb29460 Fix broken unit test 2014-07-29 16:45:59 -04:00
James Agnew 98d0fe679a Rebuild resource models 2014-07-29 15:59:11 -04:00
jamesagnew 0bc703107c Add suport for composite and sorting to JPA (not yet complete) 2014-07-29 09:10:25 -04:00
James Agnew 622e528f43 Lots of documentation updates 2014-07-22 18:12:01 -04:00
jamesagnew af3c35cbc0 More API cleanup and documentation 2014-07-22 09:14:02 -04:00
jamesagnew ad043a1b79 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParameterUtil.java
 2014-07-21 09:24:38 -04:00
James Agnew 2285d3812e Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-07-17 13:02:21 -04:00
James Agnew bb14ad09ea Start preparingh for multiple versions of FHIR 2014-07-17 09:53:52 -04:00
jamesagnew 84af486d51 Tester now suports chained parameters 2014-07-17 08:32:01 -04:00
James Agnew 41f160ed67 Documentation updates and bump to 0.5-SNAPSHOT 2014-07-15 18:36:13 -04:00
jamesagnew 568972b098 Release 0.4 2014-07-13 21:59:41 -04:00
James Agnew 28ebda71e1 Let IdDt clone without being heavyweight 2014-07-10 08:50:51 -04:00
James 02357bce4d Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-07-04 16:18:10 -04:00
James ec2326b1f2 Narrative fixes 2014-07-04 16:17:53 -04:00
jamesagnew 93a7c3e5b5 Deprocate confusing get/setId methods 2014-07-04 09:27:36 -04:00
James ca0929df07 Work on narrative generator 2014-07-03 18:02:14 -04:00
James 0ece666c88 FIx a bunch more unit tests 2014-07-02 18:01:29 -04:00
jamesagnew ba09da38b6 Start adding paging support 2014-06-23 09:04:48 -04:00
jamesagnew ab3d656249 Fix some encoding issue for token params 2014-06-12 17:13:49 -04:00
jamesagnew d241df9868 Fix broken test cases 2014-06-12 13:00:31 -04:00
jamesagnew 96986f8829 Lots of cleanup and try to speed up transacitons in JPA 2014-06-12 11:42:28 -04:00
jamesagnew 04fc0827ef Clean up transactions in JPA 2014-06-06 17:10:31 -04:00
jamesagnew 54078be6e0 Fox a bunch of JPA bugs 2014-06-05 16:01:00 -04:00
jamesagnew bb86724e12 Allow contained resources to parse and encode correctly 2014-06-03 16:52:21 -04:00
jamesagnew 2720e7d273 Lots more JPA improvementsa 2014-05-28 16:07:53 -04:00
jamesagnew 0ad18c0b77 JPA server is almost working 2014-05-27 18:52:46 -04:00
jamesagnew 245533773f More work to get transactions working 2014-05-26 09:09:54 -04:00
jamesagnew 03bf040ef9 More JPA work 2014-05-23 08:37:40 -04:00
jamesagnew 78d712de25 Add transaction operation support, and refactor IdDt into smarter datatype with URL awareness 2014-05-22 18:38:29 -04:00
jamesagnew 75205c5d75 Get JPA working with single table 2014-05-21 08:04:00 -04:00
jamesagnew ee0a16990b ne more unit test fix 2014-05-20 18:36:36 -04:00
jamesagnew f52ed02fa4 Get all of the tests passing again 2014-05-20 18:28:13 -04:00
jamesagnew 5675237f40 Lots more JPA work, and getting sorting in` 2014-05-20 08:44:55 -04:00
jamesagnew 27dab8a442 More JPA work 2014-05-18 09:40:52 -04:00
jamesagnew 4002cc8824 More JPA work 2014-05-16 17:00:06 -04:00
jamesagnew 54ab77d51a More JPA work 2014-05-15 17:52:56 -04:00
jamesagnew ed0902e40f More JPA work 2014-05-14 18:03:17 -04:00
jamesagnew 4d0b7ba84c Add QuantityDt and work on JPA server 2014-05-13 18:59:18 -04:00
jamesagnew e3bb0fa3be More work on JPA server 2014-05-13 09:01:52 -04:00
jamesagnew a269d257d3 Bump 0.3 and get all tests passing 2014-05-11 21:46:36 -04:00
jamesagnew 9f302937d9 Committing all fixes and changes from Connectathon - Lots of minor fixes, and a DB module 2014-05-05 05:57:43 -07:00
jamesagnew 6877c0628e Add validate method 2014-04-25 08:23:58 -04:00
jamesagnew 23a8b12b5e Removing cruft files 2014-04-24 07:32:10 -04:00
jamesagnew b15462ddca Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode 
Conflicts:
	hapi-fhir-base/pom.xml
	hapi-fhir-structures-dstu/pom.xml
	hapi-tinder-plugin/pom.xml
	hapi-tinder-test/pom.xml
	pom.xml
 2014-04-24 07:31:12 -04:00
jamesagnew ab3173f840 add assembly 2014-04-24 07:24:27 -04:00
jamesagnew 9ab7f8facc Fix unit tests and add changelog 2014-04-23 15:24:31 -04:00
Josh Mandel 5e59c570b5 Conflicting commons-io versions were causing 'mvn compile' to fail. 2014-04-23 10:40:25 -07:00
jamesagnew 2c52f78eb5 Narrative changes 2014-04-14 16:26:00 -04:00
jamesagnew ad05d8262e Remove Java 7 dependency 2014-04-03 17:26:52 -04:00
jamesagnew 69461ef10e Fixing unit tests 2014-04-03 14:30:49 -04:00
jamesagnew eda3995a72 More resources added 2014-04-03 07:45:07 -04:00
jamesagnew 7c64466a51 More resource generation 2014-04-02 18:42:16 -04:00
jamesagnew 5a3de7c3dd Narrative generator docs 2014-04-01 08:12:45 -04:00
jamesagnew ad189d66e2 Starting workon post methods 2014-03-27 08:51:02 -04:00
jamesagnew fb23e82ee9 Adding AdverseReaction 2014-03-25 13:42:38 -04:00
jamesagnew fe26ff5515 Fix to generator 2014-03-25 09:04:54 -04:00
jamesagnew 1481eb8ae5 More work on narrative gen 2014-03-24 18:33:51 -04:00
jamesagnew b55a4e140e Lots of bugfixes, and narrative generator is started 2014-03-24 08:32:28 -04:00
jamesagnew 2c425ca144 Fixing URL detection 2014-03-20 18:29:34 -04:00
jamesagnew 55524e4e8a Extensions in generated profiles working again 2014-03-17 15:52:41 -04:00
jamesagnew 2ca5d57f0d Profile building complete 2014-03-17 08:57:57 -04:00
jamesagnew 5088850e6b More work on JSON parser, and contained resources 2014-03-16 15:09:30 -04:00
jamesagnew f0214399ca Lots of fixes and docs to tinder 2014-03-13 17:33:12 -04:00
jamesagnew 01b3b175e9 Fix import 2014-03-13 12:58:10 -04:00
jamesagnew 561f765d00 Fixing extension building 2014-03-13 10:51:36 -04:00
jamesagnew 45c968532d Client generator now working 2014-03-13 08:00:01 -04:00
jamesagnew 360db1d296 More work on documentation 2014-03-12 18:21:17 -04:00
jamesagnew 8b6f00bb58 Workingon conformance operation for client 2014-03-12 09:03:17 -04:00
jamesagnew 53882b2c23 Fix unit tests 2014-03-10 18:17:30 -04:00
jamesagnew c830d5f45d Getting profile generation working 2014-03-10 12:43:49 -04:00
jamesagnew ff28a821d4 More client work 2014-03-07 16:23:49 -05:00
jamesagnew b33d4028ab Client working 2014-03-06 17:12:05 -05:00
jamesagnew b05ea01b45 Server is working a bit better still 2014-03-05 17:35:06 -05:00
jamesagnew 3d281217da Services working now 2014-03-04 18:25:52 -05:00
jamesagnew 5828f49029 Server starting to work 2014-03-04 16:41:18 -05:00
jamesagnew 72ef42680a Maven plugin now working 2014-03-03 18:22:14 -05:00
jamesagnew 0320d40bc1 Building from profiles now almost works 2014-03-03 09:05:55 -05:00
jamesagnew 7926387786 ValueSet building 2014-02-28 16:30:34 -05:00
jamesagnew 1fab951815 Enumerated types 2014-02-28 13:27:35 -05:00
jamesagnew 79a48611df Starting bundle processing 2014-02-26 17:13:49 -05:00