ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-21 09:51:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

updating docs

Browse Source
This commit is contained in:
ags 2018-03-28 15:54:58 +01:00
parent 51567e944d
commit 43ead64240
No known key found for this signature in database
GPG Key ID: 79EBE5A3D6E758E4
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/corda-configuration-file.rst
View File

@ -22,6 +22,8 @@ Format
The Corda configuration file uses the HOCON format which is superset of JSON. Please visit The Corda configuration file uses the HOCON format which is superset of JSON. Please visit
`<https://github.com/typesafehub/config/blob/master/HOCON.md>`_ for further details. `<https://github.com/typesafehub/config/blob/master/HOCON.md>`_ for further details.
Please do NOT use double quotes in configuration keys.
Defaults Defaults
-------- --------
A set of default configuration options are loaded from the built-in resource file ``/node/src/main/resources/reference.conf``. A set of default configuration options are loaded from the built-in resource file ``/node/src/main/resources/reference.conf``.

6
docs/source/example-code/src/main/resources/example-node.conf
View File

@ -3,9 +3,9 @@ keyStorePassword : "cordacadevpass"
trustStorePassword : "trustpass" trustStorePassword : "trustpass"
dataSourceProperties : { dataSourceProperties : {
dataSourceClassName : org.h2.jdbcx.JdbcDataSource dataSourceClassName : org.h2.jdbcx.JdbcDataSource
"dataSource.url" : "jdbc:h2:file:"${baseDirectory}"/persistence" dataSource.url : "jdbc:h2:file:"${baseDirectory}"/persistence"
"dataSource.user" : sa dataSource.user : sa
"dataSource.password" : "" dataSource.password : ""
} }
p2pAddress : "my-corda-node:10002" p2pAddress : "my-corda-node:10002"
rpcSettings = { rpcSettings = {

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

@ -10,7 +10,6 @@ import net.corda.core.internal.div
import net.corda.core.internal.exists import net.corda.core.internal.exists
import net.corda.nodeapi.internal.* import net.corda.nodeapi.internal.*
import net.corda.nodeapi.internal.config.SSLConfiguration import net.corda.nodeapi.internal.config.SSLConfiguration
import net.corda.nodeapi.internal.config.toProperties
import net.corda.nodeapi.internal.crypto.X509KeyStore import net.corda.nodeapi.internal.crypto.X509KeyStore
import net.corda.nodeapi.internal.crypto.loadKeyStore import net.corda.nodeapi.internal.crypto.loadKeyStore
import net.corda.nodeapi.internal.crypto.save import net.corda.nodeapi.internal.crypto.save
@ -43,7 +42,7 @@ object ConfigHelper {
val entrySet = finalConfig.entrySet().filter { entry -> entry.key.contains("\"") } val entrySet = finalConfig.entrySet().filter { entry -> entry.key.contains("\"") }
for (mutableEntry in entrySet) { for (mutableEntry in entrySet) {
val key = mutableEntry.key val key = mutableEntry.key
log.error("Config files should not contain \" in property names. Please fix: ${key}") log.error("Config files should not contain \" in property names. Please fix: ${key}")
} }
return finalConfig return finalConfig