156 Commits

Author SHA1 Message Date
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
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
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