Merge branch 'master' into colljos-os-hc02-merge-121217

network-management/Readme.md

@@ -2,27 +2,34 @@
 # Building the binaries
 
 ## Network management server
-To build a fat jar containing all the doorman code you can simply invoke
+To build a fat jar containing all the doorman code you can simply invoke:
 ```
     ./gradlew network-management:capsule:buildDoormanJAR
 ```
 
-The built file will appear in
+The built file will appear in:
 ```
 network-management/capsule/build/libs/doorman-<VERSION>.jar
 ```
 ## HSM signing server
-To build a fat jar containing all the HSM signer code you can simply invoke
+To build a fat jar containing all the HSM signer code you can simply invoke:
 ```
     ./gradlew network-management:capsule-hsm:buildHsmJAR
 ```
 
-The built file will appear in
+The built file will appear in:
 ```
 network-management/capsule-hsm/build/libs/hsm-<VERSION>.jar
 ```
 
-The binaries can also be obtained from artifactory after deployment in teamcity
+The binaries can also be obtained from artifactory after deployment in TeamCity.
+
+To run the HSM signing server:
+
+```
+cd network-management
+java -jar capsule-hsm/build/libs/hsm-3.0-NETWORKMAP-20171204.134345-6-capsule.jar --configFile hsm.conf
+```
 
 #Configuring network management service
 ### Local signing

network-management/hsm.conf

@@ -1,3 +1,4 @@
+basedir = "."
 device = "3001@127.0.0.1"
 keyGroup = "DEV.DOORMAN"
 keySpecifier = -1
@@ -22,4 +23,4 @@ dataSourceProperties {
   "dataSource.url" = "jdbc:h2:file:"${basedir}"/persistence;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;WRITE_DELAY=0;AUTO_SERVER_PORT="${h2port}
   "dataSource.user" = sa
   "dataSource.password" = ""
-}
+}

network-management/src/main/kotlin/com/r3/corda/networkmanage/hsm/Main.kt

@@ -2,6 +2,7 @@ package com.r3.corda.networkmanage.hsm
 
 import com.r3.corda.networkmanage.common.persistence.PersistentNetworkMapStorage
 import com.r3.corda.networkmanage.common.persistence.configureDatabase
+import com.r3.corda.networkmanage.common.utils.ShowHelpException
 import com.r3.corda.networkmanage.hsm.authentication.AuthMode
 import com.r3.corda.networkmanage.hsm.authentication.Authenticator
 import com.r3.corda.networkmanage.hsm.authentication.createProvider
@@ -20,7 +21,12 @@ import java.security.Security
 
 
 fun main(args: Array<String>) {
-    run(parseParameters(*args))
+    try {
+        run(parseParameters(*args))
+    } catch (e: ShowHelpException) {
+        e.errorMessage?.let(::println)
+        e.parser.printHelpOn(System.out)
+    }
 }
 
 fun run(parameters: Parameters) {

tools/explorer/src/main/kotlin/net/corda/explorer/Main.kt

@@ -65,10 +65,21 @@ class Main : App(MainView::class) {
         if (!isLoggedIn) {
             stage.hide()
             loginView.login()
+            addOptionalViews()
+            (find(primaryView) as MainView).initializeControls()
             stage.show()
         }
     }
 
+    private fun addOptionalViews() {
+        val iouView = find<IOUViewer>()
+        Models.get<CordaViewModel>(Main::class).apply {
+            if (iouView.isEnabledForNode()) {
+                registerView(iouView)
+            }
+        }
+    }
+
     private fun asInteger(s: String?): Int? {
         try {
             return s?.toInt()
@@ -105,7 +116,6 @@ class Main : App(MainView::class) {
             registerView<StateMachineViewer>()
             // CordApps Views.
             registerView<CashViewer>()
-            registerView<IOUViewer>()
             // Tools.
             registerView<Network>()
             registerView<Settings>()

tools/explorer/src/main/kotlin/net/corda/explorer/model/CordaViewModel.kt

@@ -11,9 +11,13 @@ class CordaViewModel {
     val registeredViews = mutableListOf<CordaView>().observable()
 
     inline fun <reified T> registerView() where  T : CordaView {
+        registerView(find<T>())
+    }
+
+    fun registerView(view: CordaView) {
         // Note: this is weirdly very important, as it forces the initialisation of Views. Therefore this is the entry
         // point to the top level observable/stream wiring! Any events sent before this init may be lost!
-        registeredViews.add(find<T>().apply { root })
+        registeredViews.add(view.apply { root })
     }
 }
 

tools/explorer/src/main/kotlin/net/corda/explorer/views/MainView.kt

@@ -48,7 +48,7 @@ class MainView : View(WINDOW_TITLE) {
     private val menuItemArrowCSS = "sidebar-menu-item-arrow"
     private val menuItemSelectedCSS = "$menuItemCSS-selected"
 
-    init {
+    fun initializeControls() {
         // Header
         userButton.textProperty().bind(myIdentity.map { it?.let { PartyNameFormatter.short.format(it.name) } })
         exit.setOnAction {

tools/explorer/src/main/kotlin/net/corda/explorer/views/cordapps/iou/IOUViewer.kt

@@ -4,7 +4,9 @@ import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView
 import javafx.scene.input.MouseButton
 import javafx.scene.layout.BorderPane
+import net.corda.core.utilities.Try
 import net.corda.explorer.model.CordaView
+import net.corda.explorer.model.MembershipListModel
 import tornadofx.*
 
 class IOUViewer : CordaView("IOU") {
@@ -24,4 +26,10 @@ class IOUViewer : CordaView("IOU") {
             }
         }
     }
+
+    fun isEnabledForNode(): Boolean = Try.on {
+                // Assuming if the model can be initialized - the CorDapp is installed
+                val allParties = MembershipListModel().allParties
+                allParties[0]
+            }.isSuccess
 }