ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-11 13:21:26 +00:00
Code Issues Actions2 Packages Projects Releases Wiki Activity

Post-merge fixes

Browse Source
This commit is contained in:
IgorNitto 2018-03-14 17:33:51 +00:00
parent 0a0c8538c4
commit 53509f9a52
3 changed files with 9 additions and 4 deletions
node/src/main
java
CordaCaplet.java
kotlin/net/corda/node/internal
AbstractNode.kt
testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting
NodeProcess.kt

1
node/src/main/java/CordaCaplet.java

@ -92,6 +92,7 @@ public class CordaCaplet extends Capsule {
(new File(baseDir, "cordapps")).mkdir();
// Add additional directories of JARs to the classpath (at the end). e.g. for JDBC drivers
augmentClasspath((List<Path>) cp, new File(baseDir, "drivers"));
try {
List<String> jarDirs = nodeConfig.getStringList("jarDirs");
log(LOG_VERBOSE, "Configured JAR directories = " + jarDirs);

10
node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt

@ -906,8 +906,12 @@ fun configureDatabase(hikariProperties: Properties,
JavaTypeDescriptorRegistry.INSTANCE.addDescriptor(AbstractPartyDescriptor(identityService))
val dataSource = DataSourceFactory.createDataSource(hikariProperties)
val attributeConverters = listOf(AbstractPartyToX500NameAsStringConverter(identityService))
val jdbcUrl = hikariProperties.getProperty("dataSource.url", "")
SchemaMigration(schemaService.schemaOptions.keys, dataSource, !isH2Database(jdbcUrl), databaseConfig).nodeStartup()
return CordaPersistence(dataSource, databaseConfig, schemaService.schemaOptions.keys, attributeConverters, cordappClassLoader)
SchemaMigration(
schemaService.schemaOptions.keys,
dataSource,
!isH2Database(jdbcUrl),
databaseConfig,
cordappClassLoader ?: Thread.currentThread().contextClassLoader).nodeStartup()
return CordaPersistence(dataSource, databaseConfig, schemaService.schemaOptions.keys, jdbcUrl, attributeConverters, cordappClassLoader)
}

2
testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt

@ -112,7 +112,7 @@ class NodeProcess(
}
fun setupPlugins(config: NodeConfig, jarPaths: List<String>): Factory {
(baseDirectory(config) / "plugins").createDirectories().also {
(baseDirectory(config) / "drivers").createDirectories().also {
jarPaths.forEach { jar -> Paths.get(jar).copyToDirectory(it) }
}
return this