Removed basedir from the config file as it's always overwritten by the --base-directory cmd line arg

This commit is contained in:
Shams Asari
2017-01-06 19:38:48 +00:00
parent d87c9eb9d2
commit 7cd281364f
39 changed files with 260 additions and 208 deletions

View File

@ -77,7 +77,6 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) {
networkMap "Notary"
node {
name "Notary"
dirName "notary"
nearestCity "London"
advertisedServices = ["corda.notary.validating"]
artemisPort 10002
@ -86,7 +85,6 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['build']) {
}
node {
name "Alice"
dirName "alice"
nearestCity "London"
advertisedServices = []
artemisPort 10004

View File

@ -1,4 +1,3 @@
basedir : "./nameserver"
myLegalName : "Notary Service"
nearestCity : "London"
keyStorePassword : "cordacadevpass"

View File

@ -1,11 +1,10 @@
basedir : "./nodea"
myLegalName : "Bank A"
nearestCity : "London"
keyStorePassword : "cordacadevpass"
trustStorePassword : "trustpass"
dataSourceProperties : {
dataSourceClassName : org.h2.jdbcx.JdbcDataSource
"dataSource.url" : "jdbc:h2:"${basedir}"/persistence"
"dataSource.url" : "jdbc:h2:file:"${basedir}"/persistence"
"dataSource.user" : sa
"dataSource.password" : ""
}

View File

@ -17,9 +17,11 @@ class ExampleNodeConfTest {
exampleNodeConfFilenames.forEach {
println("Checking $it")
val configResource = ExampleNodeConfTest::class.java.classLoader.getResource(it)
val baseDirectory = Paths.get("some-example-base-dir")
val nodeConfig = FullNodeConfiguration(
baseDirectory,
ConfigHelper.loadConfig(
baseDirectoryPath = Paths.get("some-example-base-dir"),
baseDirectory = baseDirectory,
configFileOverride = Paths.get(configResource.toURI())
)
)