CORDA-1602: Added cmd line flags to the network bootstrapper (#3419)

The list of CorDapps jars is no longer passed in via the cmd line but is now expected to be placed in the bootstrapped directory.

Ended up being a bit of a refactor to cater for unit testing, and also tidied up the bootstrapper docs.

tools/blobinspector/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'com.jfrog.artifactory'
 
 dependencies {
     compile project(':client:jackson')
-    compile 'info.picocli:picocli:3.0.0'
+    compile "info.picocli:picocli:$picocli_version"
     compile "org.slf4j:jul-to-slf4j:$slf4j_version"
     compile "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
     compile "com.jcabi:jcabi-manifests:$jcabi_manifests_version"

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

@@ -41,7 +41,7 @@ fun main(args: Array<String>) {
 
 @Command(
         name = "Blob Inspector",
-        versionProvider = VersionProvider::class,
+        versionProvider = CordaVersionProvider::class,
         mixinStandardHelpOptions = true, // add --help and --version options,
         showDefaultValues = true,
         description = ["Inspect AMQP serialised binary blobs"]
@@ -64,7 +64,9 @@ class Main : Runnable {
     var verbose: Boolean = false
 
     override fun run() {
-        System.setProperty("logLevel", if (verbose) "trace" else "off")
+        if (verbose) {
+            System.setProperty("logLevel", "trace")
+        }
 
         val bytes = source!!.readBytes().run {
             require(size > amqpMagic.size) { "Insufficient bytes for AMQP blob" }
@@ -124,8 +126,13 @@ private class SourceConverter : ITypeConverter<URL> {
     }
 }
 
-private class VersionProvider : IVersionProvider {
-    override fun getVersion(): Array<String> = arrayOf(Manifests.read("Corda-Release-Version"))
+private class CordaVersionProvider : IVersionProvider {
+    override fun getVersion(): Array<String> {
+        return arrayOf(
+                "Version: ${Manifests.read("Corda-Release-Version")}",
+                "Revision: ${Manifests.read("Corda-Revision")}"
+        )
+    }
 }
 
 private enum class FormatType { YAML, JSON }

tools/blobinspector/src/main/resources/log4j2.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="info">
+    <Properties>
+        <Property name="logLevel">off</Property>
+    </Properties>
     <Appenders>
         <Console name="STDOUT" target="SYSTEM_OUT" ignoreExceptions="false">
             <PatternLayout pattern="[%C{1}.%M] %m%n"/>