Commit Graph

10 Commits

Author SHA1 Message Date
James Agnew 030ad3934c DOcumentation updates 2014-11-10 10:59:48 -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 d1fb878c55 Merging 2014-11-08 10:36:27 -05: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
jamesagnew 96986f8829 Lots of cleanup and try to speed up transacitons in JPA 2014-06-12 11:42:28 -04:00
jamesagnew eda3995a72 More resources added 2014-04-03 07:45:07 -04:00
jamesagnew 3d281217da Services working now 2014-03-04 18:25:52 -05:00