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

Merge remote-tracking branch 'open-source/master' into thomas/os-merge-2018-06-27

Browse Source
This commit is contained in:
Thomas Schroeter 2018-06-27 13:00:37 +01:00
commit eb698160fa
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkBootstrapper.kt
View File

@ -87,7 +87,7 @@ class NetworkBootstrapper
val numParallelProcesses = Runtime.getRuntime().availableProcessors() val numParallelProcesses = Runtime.getRuntime().availableProcessors()
val timePerNode = 40.seconds // On the test machine, generating the node info takes 7 seconds for a single node. val timePerNode = 40.seconds // On the test machine, generating the node info takes 7 seconds for a single node.
val tExpected = maxOf(timePerNode, timePerNode * nodeDirs.size.toLong() / numParallelProcesses.toLong()) val tExpected = maxOf(timePerNode, timePerNode * nodeDirs.size.toLong() / numParallelProcesses.toLong())
val warningTimer = Timer("WarnOnSlowMachines", false).schedule(tExpected.toMillis()) { val warningTimer = Timer("WarnOnSlowMachines", true).schedule(tExpected.toMillis()) {
println("... still waiting. If this is taking longer than usual, check the node logs.") println("... still waiting. If this is taking longer than usual, check the node logs.")
} }
val executor = Executors.newFixedThreadPool(numParallelProcesses) val executor = Executors.newFixedThreadPool(numParallelProcesses)

31
tools/demobench/build.gradle
View File

@ -9,17 +9,19 @@
*/ */
buildscript { buildscript {
ext.tornadofx_version = '1.7.15' ext {
ext.jna_version = '4.1.0' tornadofx_version = '1.7.15'
ext.purejavacomm_version = '0.0.18' jna_version = '4.1.0'
ext.controlsfx_version = '8.40.12' purejavacomm_version = '0.0.18'
controlsfx_version = '8.40.12'
ext.java_home = System.properties.'java.home' java_home = System.properties.'java.home'
ext.pkg_source = "$buildDir/packagesrc" pkg_source = "$buildDir/packagesrc"
ext.pkg_outDir = "$buildDir/javapackage" pkg_outDir = "$buildDir/javapackage"
ext.dist_source = "$pkg_source/demobench-$version" dist_source = "$pkg_source/demobench-$version"
ext.pkg_version = version.indexOf('-') >= 0 ? version.substring(0, version.indexOf('-')) : version pkg_version = version.indexOf('-') >= 0 ? version.substring(0, version.indexOf('-')) : version
ext.pkg_macosxKeyUserName = 'R3CEV' pkg_macosxKeyUserName = 'R3CEV'
}
repositories { repositories {
mavenLocal() mavenLocal()
@ -50,6 +52,13 @@ repositories {
} }
} }
configurations {
compile {
// We don't need Hibernate just for its @Type annotation.
exclude group: 'org.hibernate', module: 'hibernate-core'
}
}
dependencies { dependencies {
// TornadoFX: A lightweight Kotlin framework for working with JavaFX UI's. // TornadoFX: A lightweight Kotlin framework for working with JavaFX UI's.
compile "no.tornado:tornadofx:$tornadofx_version" compile "no.tornado:tornadofx:$tornadofx_version"
@ -84,7 +93,7 @@ dependencies {
testCompile "junit:junit:$junit_version" testCompile "junit:junit:$junit_version"
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version" testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
testCompile "org.assertj:assertj-core:${assertj_version}" testCompile "org.assertj:assertj-core:$assertj_version"
} }
jar { jar {

11
tools/explorer/build.gradle
View File

@ -25,6 +25,13 @@ processResources {
from file("$rootDir/config/dev/log4j2.xml") from file("$rootDir/config/dev/log4j2.xml")
} }
configurations {
compile {
// We don't need Hibernate just for its @Type annotation.
exclude group: 'org.hibernate', module: 'hibernate-core'
}
}
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version" testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
@ -67,12 +74,12 @@ dependencies {
compile 'com.yuvimasory:orange-extensions:1.3.0' compile 'com.yuvimasory:orange-extensions:1.3.0'
} }
task(runDemoNodes, dependsOn: 'classes', type: JavaExec) { task runDemoNodes(dependsOn: 'classes', type: JavaExec) {
main = 'net.corda.explorer.MainKt' main = 'net.corda.explorer.MainKt'
classpath = sourceSets.main.runtimeClasspath classpath = sourceSets.main.runtimeClasspath
} }
task(runSimulationNodes, dependsOn: 'classes', type: JavaExec) { task runSimulationNodes(dependsOn: 'classes', type: JavaExec) {
main = 'net.corda.explorer.MainKt' main = 'net.corda.explorer.MainKt'
classpath = sourceSets.main.runtimeClasspath classpath = sourceSets.main.runtimeClasspath
args '-S' args '-S'