Commit Graph

481 Commits

Author SHA1 Message Date
Xiaocheng Luan
ca308fac2c Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
	src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java
2019-02-13 12:36:48 -05:00
Sean McIlvenna
270bf1b21f Merge branch 'master' of https://github.com/hapifhir/hapi-fhir-jpaserver-starter into more_properties 2019-02-12 14:08:16 -08:00
Sean McIlvenna
269dd77351 Setting properties for ModelConfig in addition to DaoConfig
Setting properties for handling Email via the emailSender() bean
2019-02-12 14:08:07 -08:00
James Agnew
a4e8093ec7 Merge pull request #6 from hapifhir/more_properties
More properties
2019-02-11 22:22:01 -05:00
Sean McIlvenna
4aaf6038cd Adding logging for some of the configurable properties 2019-02-11 17:21:32 -08:00
Sean McIlvenna
e752a99366 Using server_address property for tester config because otherwise the UI may use the wrong address 2019-02-11 16:44:43 -08:00
Sean McIlvenna
ae51c08722 Merge branch 'master' into more_properties 2019-02-11 16:42:49 -08:00
James Agnew
03bd91516e Merge pull request #1 from johnpoth/dockerfile
Update Dockerfile to point to correct WAR path and update gitignore t…
2019-02-11 16:23:07 -05:00
Sean McIlvenna
0bf713a60d Merge branch 'master' into more_properties
# Conflicts:
#	src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java
#	src/main/resources/hapi.properties
2019-02-11 11:57:32 -08:00
Sean McIlvenna
90cff9c4ae Merge pull request #4 from hapifhir/ja_improve_multiversion_support
Improve multiversion support
2019-02-11 11:25:28 -08:00
Sean McIlvenna
319b203cd0 Adding config information to README 2019-02-11 11:20:09 -08:00
Sean McIlvenna
9268c1ad3b Adding properties to HapiProperties:
* subscription.resthook.enabled
* subscription.email.enabled
* allow_placeholder_references
2019-02-11 11:19:50 -08:00
Luan, Xiaocheng (NIH/NLM/LHC) [C]
312f3d2e8b Allow optional, external configurations to override the entries in hapi.properties.
Such configurations can be specified in a properteis file outside of the war (or
webapps/hapi-fhir-jpaserver) and the server may be instructed to load the configuration using
  -Dhapi.properties=<path-of-external-configuration-file>
This is helpful in at least two use cases:
1. Deploying multiple instances with different configurations (e.g., differnt databases)
2. Future upgrade - just update the war without the need to change hapi.properties after update.
2019-02-11 13:56:01 -05:00
James Agnew
2a9e19ddf1 Add travis CI support 2019-02-11 09:02:19 -05:00
James Agnew
c604d8be53 Improve multiversion support 2019-02-11 08:59:37 -05:00
James Agnew
e21e00cf09 Merge pull request #3 from lantanagroup/master
Using a configurable properties file
2019-02-07 20:19:22 -05:00
James Agnew
b88ba31da4 Merge branch 'master' into master 2019-02-07 20:19:11 -05:00
James Agnew
2366dcc66e Merge branch 'master' of github.com:hapifhir/hapi-fhir-jpaserver-starter 2019-02-07 17:21:09 -05:00
Sean McIlvenna
19c22e0a0d Re-throwing handled exception as configuration exceptions 2019-02-06 22:38:59 -08:00
Sean McIlvenna
7a96e96996 Using a configurable properties file for settings that might change between environments 2019-02-06 16:00:38 -08:00
James Agnew
ce32efa582 Upgrade to 3.7.0 2019-02-06 09:42:45 -05:00
jamesagnew
18c85900e5 Rebasing 2018-12-10 05:50:48 -05:00
jpoth
20c0e2c567 Update Dockerfile to point to correct WAR path and update gitignore to ignore IntelliJ IDEA resources 2018-11-21 10:30:45 +01:00
James Agnew
76f9a2f0f3 Updates to get this building 2018-11-12 09:37:54 -05:00
James Agnew
58da08d590 Updates to the demo 2018-11-12 09:30:46 -05:00
James Agnew
c468a5778d Updates to JPA server 2018-11-12 09:21:29 -05:00
James Agnew
2a5ca3fcd7 Update the examples 2018-08-27 10:59:52 -04:00
James Agnew
7650bae6a8 Bump HAPI FHIR version 2018-07-30 08:13:42 -04:00
James Agnew
8c436dcfe3 update readme 2018-07-26 08:28:03 +07:00
James Agnew
693dc34e55 Initial commit 2018-07-26 08:06:41 +07:00
James Agnew
6da96ab869 Initial commit 2018-07-26 07:16:13 +07:00