Commit Graph

376 Commits

Author SHA1 Message Date
James add96f2124 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-07-04 17:19:51 -04:00
James 0d13dc886b Allow server to specify its own base 2014-07-04 17:19:33 -04:00
t106uhn 8c1c156e04 testing commit 2014-07-04 16:24:48 -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
t106uhn e0d0574cce commit 2014-07-04 15:59:12 -04:00
t106uhn 8703e81821 commit 2014-07-04 15:49:54 -04:00
t106uhn ca9264061b Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir.git 2014-07-04 14:32:09 -04:00
jamesagnew 93a7c3e5b5 Deprocate confusing get/setId methods 2014-07-04 09:27:36 -04:00
t106uhn e98205a8f2 added new exception 2014-07-03 18:51:18 -04:00
jamesagnew de51a40904 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-07-03 18:35:54 -04:00
jamesagnew ee53c40ff8 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml
	hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/templates/tmpl-home-welcome.html
2014-07-03 18:35:37 -04:00
James 80c13494a8 Fix JSON parser NPE 2014-07-03 18:35:23 -04:00
James ca0929df07 Work on narrative generator 2014-07-03 18:02:14 -04:00
James c811c164b5 Fix unit test 2014-07-03 10:34:55 -04:00
James 0ece666c88 FIx a bunch more unit tests 2014-07-02 18:01:29 -04:00
t106uhn 3e8ea1d4ed Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir.git 2014-07-02 16:20:20 -04:00
James 1c05bcb29c Fix a number of unit tests 2014-07-02 15:24:29 -04:00
jamesagnew 14befcd091 Lots of tester enhancements 2014-07-02 08:57:07 -04:00
jamesagnew f87c50b4b4 Lots of tester work 2014-06-27 18:28:27 -04:00
jamesagnew 50d68d6090 Fix a few parsing issues and add multi server support to tester 2014-06-27 09:05:51 -04:00
jamesagnew 4cd7ff16fb More tester enhancements 2014-06-26 18:06:23 -04:00
t106uhn e576d5ba8f Merge branch 'master' of https://github.com/jamesagnew/hapi-fhir.git 2014-06-26 14:06:26 -04:00
jamesagnew 97e17f9149 Fix code highlighting 2014-06-26 09:06:10 -04:00
jamesagnew 3bc1d35698 Add method which was removed but make it deprocated 2014-06-25 17:22:47 -04:00
jamesagnew acbffecd15 Still trying to get this working with Jenkins 2014-06-25 17:01:32 -04:00
jamesagnew cf63f6bacf FIx unit tests 2014-06-25 13:54:44 -04:00
jamesagnew 1916656e6e Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
Conflicts:
	hapi-fhir-base/src/main/resources/ca/uhn/fhir/rest/server/tester/RestfulTester.html
2014-06-25 09:56:12 -04:00
jamesagnew 411644c4ff More tester work 2014-06-25 09:49:13 -04:00
jamesagnew 68ea31495c More enhancements for the tester, and merge read/vread methods 2014-06-25 09:07:14 -04:00
jamesagnew e093b23892 Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode 2014-06-24 08:47:36 -04:00
jamesagnew a51edb83aa More paging work on tester 2014-06-24 08:46:54 -04:00
jamesagnew 875acee2ac Fix failing unit tests 2014-06-23 10:31:02 -04:00
jamesagnew ba09da38b6 Start adding paging support 2014-06-23 09:04:48 -04:00
jamesagnew 4d90955e75 Make resource detection kind of case insensitive (to deal with some healthintersections responses) 2014-06-20 16:54:09 -04:00
jamesagnew f4b8f18a8a Make highlighting optional 2014-06-17 09:18:37 -04:00
jamesagnew 5152f0ba9b Lots more work getting the JPA tester working 2014-06-17 07:48:50 -04:00
jamesagnew bba62b2972 Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode 2014-06-12 22:21:45 -04:00
jamesagnew 00f7a76ee9 Lots more work on the tester servlet 2014-06-12 22:20:23 -04:00
jamesagnew ab3d656249 Fix some encoding issue for token params 2014-06-12 17:13:49 -04:00
jamesagnew 58bb97e6d0 Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode 2014-06-12 13:04:30 -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
lmds 7ef8640ef7 update restful server to prompt user for credentials on authorization exception if request came from a browser 2014-06-10 15:34:50 -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
t106uhn 9724f1219b Merge branch 'master' of ssh://nacharya@git.code.sf.net/p/hl7api/fhircode 2014-06-03 20:46:57 -04:00
jamesagnew bb86724e12 Allow contained resources to parse and encode correctly 2014-06-03 16:52:21 -04:00
t106uhn 51d16ea92f Merge branch 'master' of ssh://nacharya@git.code.sf.net/p/hl7api/fhircode 2014-06-02 19:34:01 -04:00
jamesagnew dfa88a442c Get history and tags working properly on JPA 2014-06-02 09:07:10 -04:00
jamesagnew be44a2bca2 More work on JPA 2014-05-29 19:00:16 -04:00
jamesagnew a0b120f70e Add history to JPA 2014-05-29 09:17:12 -04:00
jamesagnew 2720e7d273 Lots more JPA improvementsa 2014-05-28 16:07:53 -04:00
jamesagnew adde115c53 working on binary resources 2014-05-28 07:30:40 -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 de3fbc9023 Get transaction working in server 2014-05-23 18:29:32 -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 30065fdfae More work on transaction method 2014-05-22 10:20:51 -04:00
jamesagnew 62b909ff22 Starting work on transaction interaction 2014-05-22 07:46:24 -04:00
jamesagnew fab60d1ac8 Add deleted bundle entry handling 2014-05-21 18:12:00 -04:00
jamesagnew 1b44e7282d Fix a few issues with JPA 2014-05-21 16:17:45 -04:00
t106uhn 413baed28d fdfdfd 2014-05-21 15:32:15 -04:00
t106uhn df93b808e8 my change 2014-05-21 15:28:12 -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 610bb542ca Introduce the ability for search parameters to have qualifiers, and add StringParameter to allow exact string matches 2014-05-16 08:34:31 -04:00
jamesagnew 54ab77d51a More JPA work 2014-05-15 17:52:56 -04:00
jamesagnew ca5927880f More work on JPA 2014-05-15 08:08:07 -04:00
jamesagnew ed0902e40f More JPA work 2014-05-14 18:03:17 -04:00
jamesagnew 10dc8b39aa More work on JPA server 2014-05-14 08:55:27 -04:00
jamesagnew 4d0b7ba84c Add QuantityDt and work on JPA server 2014-05-13 18:59:18 -04:00
jamesagnew 0869b1fc14 Site updates 2014-05-12 08:38:06 -04:00
jamesagnew a269d257d3 Bump 0.3 and get all tests passing 2014-05-11 21:46:36 -04:00
jamesagnew fb998a6a32 Fix some bugs on the generic client 2014-05-09 17:54:55 -04:00
jamesagnew b937d5c2dc More work on fluent interface 2014-05-09 08:37:19 -04:00
jamesagnew 86e5948d60 Fluent interface is basically working 2014-05-09 08:32:42 -04:00
jamesagnew e66bd31171 Get fluent client working 2014-05-08 17:52:36 -04:00
jamesagnew 2b683b8f02 Get fluent client working 2014-05-08 07:57:11 -04:00
jamesagnew de926434b8 FIx broken compile 2014-05-07 18:15:08 -04:00
jamesagnew 5ad9e39d7b Fluent interface starting up.. A few bit break right now 2014-05-07 18:14:08 -04:00
jamesagnew 4b7a4ac794 Lots of bug fixes and documentation tweaks - Several failing unit tests checked in, need to get these passing 2014-05-07 08:18:43 -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 25a40df96e More work on the tester, and a number of bug fixes 2014-05-02 19:56:26 -07:00
jamesagnew a1aedf2f31 Documentation fixes 2014-05-01 17:53:33 -04:00
jamesagnew 862b1bd79d More work on tester 2014-05-01 08:40:48 -04:00
jamesagnew 63c9fb466c A number of bugfixes around parsing and client implementation 2014-04-30 18:39:33 -04:00
jamesagnew f737797d7a More tester work 2014-04-30 09:03:02 -04:00
jamesagnew 51c95219f6 Tester work 2014-04-30 07:47:05 -04:00
jamesagnew 7736e201e2 More qwork on the tester 2014-04-29 17:29:46 -04:00
jamesagnew c20e7e450a More work on the tester 2014-04-29 09:27:06 -04:00
jamesagnew 5615f9b7d7 Adding tester module - not nearly complete though 2014-04-28 18:04:26 -04:00
jamesagnew 2287011601 Refactor method outcomes abit 2014-04-28 08:39:22 -04:00
jamesagnew e69464f34d Lots of documentation (site and javadoc) updates, and make since and count params work for history operation 2014-04-27 22:17:27 -04:00
jamesagnew 6877c0628e Add validate method 2014-04-25 08:23:58 -04:00
jamesagnew 15ae763313 Response writing is fixed 2014-04-24 17:27:25 -04:00
jamesagnew 6d866b81b6 Get HttpServletRequest and Response working in server params 2014-04-24 12:25:47 -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
jamesagnew 018e780343 Client security working 2014-04-23 14:23:32 -04:00
jamesagnew 0b93dcc491 Fix broken unit tests and begin preparing for non-resource specific items 2014-04-22 17:10:25 -04:00
jamesagnew 5da4698fab Some refactoring - Currently does not compile,will fix this afternoon 2014-04-22 08:58:28 -04:00
jamesagnew e9a71d843a Documentation enhancements 2014-04-17 18:13:23 -04:00
jamesagnew 1808896b28 Site fixes 2014-04-15 08:50:42 -04:00
jamesagnew 2c52f78eb5 Narrative changes 2014-04-14 16:26:00 -04:00
jamesagnew bdd5297603 Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode 2014-04-14 13:01:54 -04:00
jamesagnew 03ee95c011 Add test 2014-04-14 13:01:42 -04:00
jamesagnew 2e5aac29d1 History operation working 2014-04-14 08:40:30 -04:00
jamesagnew 84096da74d Adding history 2014-04-10 15:57:45 -04:00
jamesagnew acb5b02672 Get delete working 2014-04-09 08:23:58 -04:00
jamesagnew 3a7ea0c8ba Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode 2014-04-08 18:31:19 -04:00
jamesagnew 7d319fa770 Start to implement delete 2014-04-08 18:30:51 -04:00
t106uhn 28a4940601 added new jetty dependancy 2014-04-03 22:09:36 -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 f7a4b48e07 Doc updates 2014-04-02 08:05:16 -04:00
jamesagnew 81b2b1cc50 More narrative work 2014-04-01 18:01:52 -04:00
jamesagnew 57a3a4881e Narrative fixes 2014-04-01 13:28:33 -04:00
jamesagnew 5a3de7c3dd Narrative generator docs 2014-04-01 08:12:45 -04:00
jamesagnew 12d8e8d19c Narrative docs 2014-03-31 17:10:05 -04:00
jamesagnew cfdf0bcf27 Website improvements 2014-03-31 08:19:31 -04:00
jamesagnew ea73770433 Documentation updates 2014-03-28 17:11:56 -04:00
jamesagnew b325a5bfb1 Create method almost working 2014-03-28 07:49:01 -04:00
jamesagnew b38be51668 Create methd 2014-03-27 18:38:24 -04:00
jamesagnew ad189d66e2 Starting workon post methods 2014-03-27 08:51:02 -04:00
jamesagnew 082ebb64c1 Narrative generator now working 2014-03-26 17:37:08 -04:00
jamesagnew 4953c5629c Narrative enhancements 2014-03-26 08:59:42 -04:00
jamesagnew ece3fab5f8 Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode 2014-03-25 18:09:23 -04:00
jamesagnew de50244875 Narrative generation continuing 2014-03-25 18:08:57 -04:00
t37622uhn d3fc34a30a Removed CautionNote fields 2014-03-25 15:29:12 -04:00
jamesagnew 21619e5e46 Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode 2014-03-25 13:43:35 -04:00
jamesagnew fb23e82ee9 Adding AdverseReaction 2014-03-25 13:42:38 -04:00
t37622uhn fbf7305a92 Renamed "setMyCautionNote" method to "setCautionNote" 2014-03-25 13:14:57 -04:00
t37622uhn fe387b564b Added Caution Note extension as a list of StringDt 2014-03-25 13:10:04 -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 46d6387761 JsonParser contained working 2014-03-22 12:33:07 -04:00
jamesagnew cb19b17e59 Many bugfixes 2014-03-21 15:32:37 -04:00
jamesagnew 79bdd94f72 Some unit test fixes, still some failures 2014-03-21 08:12:44 -04:00
jamesagnew 2c425ca144 Fixing URL detection 2014-03-20 18:29:34 -04:00
jamesagnew 80826b62fd Fix unit tests 2014-03-20 13:49:51 -04:00
jamesagnew 1fddb04fb3 Start json parser 2014-03-20 08:02:36 -04:00
jamesagnew 31e8584f12 Unit test fixes 2014-03-19 17:38:31 -04:00
jamesagnew f278d9d096 Fix unit tests 2014-03-19 11:40:06 -04:00
jamesagnew eb1df7b36a Conformance generation 2014-03-19 08:56:37 -04:00
jamesagnew 7b7a663748 Get server conformance working 2014-03-18 17:31:32 -04:00
jamesagnew b8dd4fa9f2 Fix unit tests 2014-03-18 11:54:20 -04:00
jamesagnew 6b60703a74 Start include params 2014-03-18 08:41:48 -04:00
jamesagnew d6e3750657 Fix unit test bugs 2014-03-17 10:25:00 -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 be7a31c4c5 More json parser work 2014-03-14 16:35:43 -04:00
jamesagnew f2ba56af2f Start JSON parser 2014-03-14 08:57:30 -04:00
jamesagnew f0214399ca Lots of fixes and docs to tinder 2014-03-13 17:33:12 -04:00
jamesagnew e0b5d224ca Fix unit tests 2014-03-13 12:43:25 -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 df2675867a More documentation 2014-03-11 17:39:41 -04:00
jamesagnew fefd0e9a57 More documentation and profile export working 2014-03-11 08:39:55 -04:00
jamesagnew 53882b2c23 Fix unit tests 2014-03-10 18:17:30 -04:00
jamesagnew 6140e73034 Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode 2014-03-10 12:44:33 -04:00
jamesagnew c830d5f45d Getting profile generation working 2014-03-10 12:43:49 -04:00
Yogthos 1adfa2a246 updated AuthenticationException to extend BaseServerResponseException 2014-03-10 10:47:48 -04:00
Yogthos daa5ed6ea8 updated authenticate method in ISecurityManager to be void and throw an AuthenticationException,
updated RestfulServer to return 401 when SecurityManager is present and authenticate throws the exception
2014-03-10 10:43:33 -04:00
jamesagnew e63bb877ac Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode 2014-03-07 17:31:38 -05:00
jamesagnew df46f25e7e Website changes 2014-03-07 17:31:05 -05:00
Yogthos 79670cf172 added the ISecurityManager interface 2014-03-07 17:18:40 -05:00
jamesagnew ff28a821d4 More client work 2014-03-07 16:23:49 -05:00
jamesagnew 9751aa15e8 More unit test work 2014-03-07 09:14:50 -05:00
jamesagnew b33d4028ab Client working 2014-03-06 17:12:05 -05:00
jamesagnew 82193017d8 More client work 2014-03-06 08:55:31 -05:00
jamesagnew b05ea01b45 Server is working a bit better still 2014-03-05 17:35:06 -05:00
jamesagnew d94d2719d9 Fix some merge issues 2014-03-05 09:33:29 -05:00
jamesagnew a74766e620 Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/server/RestfulServer.java
2014-03-05 09:24:08 -05:00
jamesagnew b15504ab6a Starting client implementation 2014-03-05 08:26:26 -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 ce17e82f9d Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode 2014-03-04 09:17:04 -05:00
jamesagnew a2d2b81d7f Working on service implementation 2014-03-04 08:13:28 -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 42d8037a06 Atom parsing now works! 2014-02-27 16:51:43 -05:00
jamesagnew 14b795ad68 Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode
Conflicts:
	hapi-fhir-base/pom.xml
2014-02-27 13:23:35 -05:00
jamesagnew ff40a4c1e3 Upgrading HTTP client version for unit tests 2014-02-27 13:21:47 -05:00
Yogthos 115fccc622 Merge remote-tracking branch 'origin/master' 2014-02-27 12:07:54 -05:00
Yogthos 3fdb05d208 updated dependencies 2014-02-27 12:07:27 -05:00
Yogthos f2d530112e cleaned up getting the return type for the resource method 2014-02-27 12:07:12 -05:00
jamesagnew 45c9186dee More Atom 2014-02-27 12:04:19 -05:00