ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-14 08:49:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[ENT-795]: Allowed Corda to run against a standalone database

Browse Source
This commit is contained in:
Michele Sollecito 2017-10-23 14:12:44 +01:00 committed by GitHub
parent dfb226fbbb
commit 01d8ad41b4
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/compiler.xml generated
View File

@ -71,6 +71,9 @@
<module name="loadtest_test" target="1.8" /> <module name="loadtest_test" target="1.8" />
<module name="mock_main" target="1.8" /> <module name="mock_main" target="1.8" />
<module name="mock_test" 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_main" target="1.8" />
<module name="network-visualiser_test" target="1.8" /> <module name="network-visualiser_test" target="1.8" />
<module name="node-api_main" target="1.8" /> <module name="node-api_main" target="1.8" />

2
docs/source/changelog.rst
View File

@ -6,6 +6,8 @@ from the previous milestone release.
UNRELEASED 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``. * ``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. This is a minor change to the public API, but is required to ensure that classes like ``SecureHash`` are immutable.

1
node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
View File

@ -29,6 +29,7 @@ object ConfigHelper {
val appConfig = ConfigFactory.parseFile(configFile.toFile(), parseOptions.setAllowMissing(allowMissingConfig)) val appConfig = ConfigFactory.parseFile(configFile.toFile(), parseOptions.setAllowMissing(allowMissingConfig))
val finalConfig = configOverrides val finalConfig = configOverrides
// Add substitution values here // Add substitution values here
.withFallback(ConfigFactory.systemProperties())
.withFallback( configOf("baseDirectory" to baseDirectory.toString())) .withFallback( configOf("baseDirectory" to baseDirectory.toString()))
.withFallback(appConfig) .withFallback(appConfig)
.withFallback(defaultConfig) .withFallback(defaultConfig)