Add 'finance' module to Corda WebServer, for plugins to use. (#489)

* Add 'finance' module to Corda WebServer, for plugins to use.
* Fix wording of error message.

tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt

@@ -220,6 +220,8 @@ class NodeConfigTest {
 
         assertEquals(localPort(20001), webConfig.webAddress)
         assertEquals(localPort(10001), webConfig.p2pAddress)
+        assertEquals("trustpass", webConfig.trustStorePassword)
+        assertEquals("cordacadevpass", webConfig.keyStorePassword)
     }
 
     @Test

webserver/build.gradle

@@ -31,6 +31,7 @@ sourceSets {
 
 dependencies {
     compile project(':core')
+    compile project(':finance')
     compile project(':client:rpc')
     compile project(':client:jackson')
     testCompile project(':node')

webserver/src/main/kotlin/net/corda/webserver/internal/NodeWebServer.kt

@@ -161,6 +161,11 @@ class NodeWebServer(val config: WebServerConfig) {
             } catch (e: java.nio.file.NoSuchFileException) {
                 log.debug("Tried to open a file that doesn't yet exist, retrying", e)
                 Thread.sleep(retryDelay)
+            } catch (e: Throwable) {
+                // E.g. a plugin cannot be instantiated?
+                // Note that we do want the exception stacktrace.
+                log.error("Cannot start WebServer", e)
+                throw e
             }
         }
     }