CORDA-3024 Rename the webserver (#5489)

This commit is contained in:
Tudor Malene
2019-09-26 10:20:49 +01:00
committed by Shams Asari
parent f945e57c17
commit 298d8ba69c
38 changed files with 42 additions and 42 deletions

View File

@ -31,7 +31,7 @@ apply plugin: 'kotlin'
apply plugin: 'application'
evaluationDependsOn(':tools:explorer:capsule')
evaluationDependsOn(':webserver:webcapsule')
evaluationDependsOn(':testing:testserver:testcapsule:')
mainClassName = 'net.corda.demobench.DemoBench'
applicationDefaultJvmArgs = [
@ -85,7 +85,7 @@ dependencies {
compile ':purejavacomm-0.0.18'
testCompile project(':test-utils')
testCompile project(':webserver')
testCompile project(':testing:testserver')
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
@ -139,8 +139,8 @@ distributions {
into 'corda'
fileMode = 0444
}
from(project(':webserver:webcapsule').tasks.buildWebserverJar) {
rename 'corda-webserver-(.*)', 'corda-webserver.jar'
from(project(':testing:testserver:testcapsule:').tasks.buildWebserverJar) {
rename 'corda-testserver-(.*)', 'corda-testserver.jar'
into 'corda'
fileMode = 0444
}

View File

@ -5,7 +5,7 @@ import tornadofx.*
class WebServerController : Controller() {
private val jvm by inject<JVMConfig>()
private val webserverPath = jvm.applicationDir.resolve("corda").resolve("corda-webserver.jar")
private val webserverPath = jvm.applicationDir.resolve("corda").resolve("corda-testserver.jar")
init {
log.info("Web Server JAR: $webserverPath")