mirror of
https://github.com/corda/corda.git
synced 2025-06-13 04:38:19 +00:00
Removed basedir from the config file as it's always overwritten by the --base-directory cmd line arg
This commit is contained in:
@ -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
|
||||
|
@ -1,4 +1,3 @@
|
||||
basedir : "./nameserver"
|
||||
myLegalName : "Notary Service"
|
||||
nearestCity : "London"
|
||||
keyStorePassword : "cordacadevpass"
|
||||
|
@ -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" : ""
|
||||
}
|
||||
|
@ -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())
|
||||
)
|
||||
)
|
||||
|
Reference in New Issue
Block a user