From 01d8ad41b44991a79fd0dce924a95e19dde52585 Mon Sep 17 00:00:00 2001
From: Michele Sollecito <michele.sollecito@gmail.com>
Date: Mon, 23 Oct 2017 14:12:44 +0100
Subject: [PATCH] [ENT-795]: Allowed Corda to run against a standalone database

---
 .idea/compiler.xml                                             | 3 +++
 docs/source/changelog.rst                                      | 2 ++
 .../kotlin/net/corda/node/services/config/ConfigUtilities.kt   | 1 +
 3 files changed, 6 insertions(+)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 1bd2adab38..360c6ff7bd 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -71,6 +71,9 @@
       <module name="loadtest_test" target="1.8" />
       <module name="mock_main" target="1.8" />
       <module name="mock_test" target="1.8" />
+      <module name="network-management_integrationTest" target="1.8" />
+      <module name="network-management_main" target="1.8" />
+      <module name="network-management_test" target="1.8" />
       <module name="network-visualiser_main" target="1.8" />
       <module name="network-visualiser_test" target="1.8" />
       <module name="node-api_main" target="1.8" />
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index e3be980710..480f187ce6 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -6,6 +6,8 @@ from the previous milestone release.
 
 UNRELEASED
 ----------
+* ``ConfigUtilities`` now read system properties for a node. This allow to specify data source properties at runtime.
+
 * ``OpaqueBytes.bytes`` now returns a clone of its underlying ``ByteArray``, and has been redeclared as ``final``.
   This is a minor change to the public API, but is required to ensure that classes like ``SecureHash`` are immutable.
 
diff --git a/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt b/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
index 0c02826cf6..b3cec7de64 100644
--- a/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
+++ b/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
@@ -29,6 +29,7 @@ object ConfigHelper {
         val appConfig = ConfigFactory.parseFile(configFile.toFile(), parseOptions.setAllowMissing(allowMissingConfig))
         val finalConfig = configOverrides
                 // Add substitution values here
+                .withFallback(ConfigFactory.systemProperties())
                 .withFallback( configOf("baseDirectory" to baseDirectory.toString()))
                 .withFallback(appConfig)
                 .withFallback(defaultConfig)