Tackle comments from code review and fix bad merge on version

This commit is contained in:
Matthew Nesbit
2016-08-05 16:42:55 +01:00
parent d3309c1171
commit 3dc8a95d69
2 changed files with 4 additions and 3 deletions

View File

@ -46,7 +46,7 @@ allprojects {
// Our version: bump this on release. // Our version: bump this on release.
group 'com.r3corda' group 'com.r3corda'
version '0.2-SNAPSHOT' version '0.3-SNAPSHOT'
} }
repositories { repositories {
@ -192,7 +192,7 @@ applicationDistribution.into("bin") {
} }
task createCapsule(type:FatCapsule, dependsOn: 'quasarScan') { task createCapsule(type:FatCapsule, dependsOn: 'quasarScan') {
applicationClass 'com.r3corda.standalone.MainKt' applicationClass 'com.r3corda.node.MainKt'
capsuleManifest { capsuleManifest {
appClassPath = ["jolokia-agent-war-${project.ext.jolokia_version}.war"] appClassPath = ["jolokia-agent-war-${project.ext.jolokia_version}.war"]

View File

@ -1,4 +1,4 @@
package com.r3corda.standalone package com.r3corda.node
import com.r3corda.node.services.config.FullNodeConfiguration import com.r3corda.node.services.config.FullNodeConfiguration
import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigFactory
@ -68,6 +68,7 @@ fun main(args: Array<String>) {
val node = conf.createNode() val node = conf.createNode()
node.start() node.start()
try { try {
// TODO create a proper daemon and/or provide some console handler to give interactive commands
while (true) Thread.sleep(Long.MAX_VALUE) while (true) Thread.sleep(Long.MAX_VALUE)
} catch(e: InterruptedException) { } catch(e: InterruptedException) {
node.stop() node.stop()