491 Commits

Author SHA1 Message Date
jamesagnew
fcb9a80bbc DateRangeParam now correctly handles requests containing a single date 2014-11-08 12:17:42 -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
b.debeaubien
8f704030ed Added RES_ID property to BaseResource to facilitate searching for resources based on _id. 2014-11-07 12:24:16 -05:00
James Agnew
4e769da4ca Give securityevent a common parent 2014-11-04 13:29:21 -05:00
James Agnew
1bd51f6118 Potential solution for #47 (bad test) 2014-11-03 18:48:32 -05:00
James Agnew
5aafeee3d3 Documentation updates 2014-11-03 14:16:04 -05:00
James Agnew
e9497c019a Merge pull request #48 from wdebeau1/master
ProvidedResources
2014-11-03 13:41:29 -05:00
b.debeaubien
7071de5b6b Merge branch 'master' of https://github.com/wdebeau1/hapi-fhir 2014-11-03 09:04:37 -05:00
b.debeaubien
4a4dd90f6e Added the ProvidesResources annotation and supporting classes, which allows server authors to specify resources that should be added to the initial resource list (and thus show up in the list of profiles returned from a search) 2014-11-03 09:04:16 -05:00
b.debeaubien
257156b014 Added the ProvidesResources annotation and supporting classes, which allows server authors to specify resources that should be added to the initial resource list (and thus show up in the list of profiles returned from a search) 2014-11-03 09:04:08 -05:00
James Agnew
ece0e83609 Site updates 2014-10-31 16:09:42 -04:00
James Agnew
3d320a8fe3 Fix test yet again! 2014-10-31 15:05:21 -04:00
James Agnew
9c3ce5be86 Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-10-31 15:00:38 -04:00
James Agnew
ae56cf665e Skup failing test on windows 2014-10-31 15:00:26 -04:00
James Agnew
3c4a2d6691 Merge pull request #45 from wdebeau1/master
Updated docs in ResourceDef to indicate what id is used for (potentially...
2014-10-31 14:42:51 -04:00
James Agnew
103b1ba99f Hopefully fix Windows build issue 2014-10-31 14:30:33 -04:00
b.debeaubien
db9372b1e7 Merge branch 'master' of https://github.com/wdebeau1/hapi-fhir 2014-10-31 12:14:58 -04:00
b.debeaubien
11894710f9 Updated docs in ResourceDef to indicate what id is used for (potentially it's also used for other things, though I didn't find any)
Added a test that demonstrates using ResourceDef.id to set the id for a custom resource's profile
2014-10-31 12:14:54 -04:00
James Agnew
567fd1219c Fix conflict between DSTU and DEV 2014-10-31 10:35:12 -04:00
b.debeaubien
930d860c70 Updated docs in ResourceDef to indicate what id is used for (potentially it's also used for other things, though I didn't find any)
Added a test that demonstrates using ResourceDef.id to set the id for a custom resource's profile
2014-10-31 09:54:44 -04:00
James Agnew
60425a003c Add credit for #44 2014-10-30 14:01:45 -04:00
James Agnew
73f6dd781a Merge branch 'petromykhailysyn-master' 2014-10-30 13:59:27 -04:00
James Agnew
c7d4441d3b Merge branch 'master' of github.com:petromykhailysyn/hapi-fhir into petromykhailysyn-master 2014-10-30 13:59:12 -04:00
James Agnew
e9ab9c8259 Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Conflicts:
	hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java
2014-10-30 13:58:33 -04:00
James Agnew
135ba9d9e6 Moving site generation into root project 2014-10-30 13:57:29 -04:00
James Agnew
1d2141accd Merge pull request #43 from wdebeau1/master
Fix for https://github.com/jamesagnew/hapi-fhir/issues/42
2014-10-30 13:57:03 -04:00
b.debeaubien
374da3f3a0 Fix for https://github.com/jamesagnew/hapi-fhir/issues/42
A few more eclipse exclusions for .gitignore
2014-10-30 11:41:48 -04:00
petromykhailyshyn
c474839f01 IOException is removed from CustomThymeleafNarrativeGenerator 2014-10-30 16:59:10 +02:00
b.debeaubien
bd89d18e03 Merge branch 'master' of https://github.com/wdebeau1/hapi-fhir
Conflicts:
	hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java
2014-10-30 10:09:56 -04:00
b.debeaubien
b733b1a1dd https://github.com/jamesagnew/hapi-fhir/issues/39
AddProfileTagEnum is now public, so that one can actually call setAddProfileTag.
2014-10-30 10:07:34 -04:00
b.debeaubien
edc8614ba8 Merging master 2014-10-30 10:06:42 -04:00
James Agnew
f2f09d03df Add constructor and javadocs 2014-10-29 16:23:19 -04:00
James Agnew
da6a5d5a24 Move BoundCodeableConceptDt back to where it originally was for DSTU1
resources
2014-10-29 16:08:07 -04:00
b.debeaubien
7c0ebd6e98 https://github.com/jamesagnew/hapi-fhir/issues/39
AddProfileTagEnum is now public, so that one can actually call setAddProfileTag.
2014-10-29 16:00:54 -04:00
b.debeaubien
d9e21a7192 Fix for https://github.com/jamesagnew/hapi-fhir/issues/42 2014-10-29 15:50:43 -04:00
James Agnew
d2e6fc2253 Test updates to make Jenkins happy 2014-10-29 15:48:05 -04:00
James Agnew
109bbb4a5d Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-10-29 15:35:13 -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
23cff9fa58 Merge pull request #41 from wdebeau1/master
Added codeable concept extension to ResourceWithExtensionsA to demonstra...
2014-10-29 15:34:46 -04:00
b.debeaubien
812e513854 Added codeable concept extension to ResourceWithExtensionsA to demonstrate bug in RuntimeResourceDefinition.scanForExtensions 2014-10-29 15:13:20 -04:00
James Agnew
8f610d2c3a Add some tests 2014-10-29 09:04:44 -04:00
James Agnew
5abdb5680a Merge branch 'master' of github.com:jamesagnew/hapi-fhir 2014-10-28 11:16:07 -04:00
James Agnew
763f7195db Merge pull request #38 from wdebeau1/master
ServerProfileProvider now uses IdDt.getIdPart() rather than getValue() s...
2014-10-28 11:15:36 -04:00
b.debeaubien
7f965c447f ServerProfileProvider now uses IdDt.getIdPart() rather than getValue() so that it can find the profiles in in FhirContext's myIdToResourceDefinition. 2014-10-27 13:53:01 -04:00
jamesagnew
4117989784 Eclipse files 2014-10-26 15:08:48 -04:00
James Agnew
d756b73fa5 Docs 2014-10-24 16:24:06 -04:00