Merge remote-tracking branch 'remotes/origin/master' into mnesbit-cor-261-artemis-over-ssl

node/src/main/kotlin/com/r3corda/node/internal/Node.kt

@@ -16,8 +16,13 @@ import com.r3corda.node.servlets.Config
 import com.r3corda.node.servlets.DataUploadServlet
 import com.r3corda.node.servlets.ResponseFilter
 import com.r3corda.node.utilities.AffinityExecutor
+import org.eclipse.jetty.server.Handler
 import org.eclipse.jetty.server.Server
+import org.eclipse.jetty.server.handler.DefaultHandler
 import org.eclipse.jetty.server.handler.HandlerCollection
+import org.eclipse.jetty.server.handler.HandlerList
+import org.eclipse.jetty.server.handler.ResourceHandler
+import org.eclipse.jetty.servlet.DefaultServlet
 import org.eclipse.jetty.servlet.ServletContextHandler
 import org.eclipse.jetty.servlet.ServletHolder
 import org.eclipse.jetty.webapp.WebAppContext
@@ -96,7 +101,15 @@ class Node(dir: Path, val p2pAddr: HostAndPort, val webServerAddr: HostAndPort,
         }
 
         // API, data upload and download to services (attachments, rates oracles etc)
-        handlerCollection.addHandler(ServletContextHandler().apply {
+        handlerCollection.addHandler(buildServletContextHandler())
+
+        server.handler = handlerCollection
+        server.start()
+        return server
+    }
+
+    private fun buildServletContextHandler(): ServletContextHandler {
+        return ServletContextHandler().apply {
             contextPath = "/"
             setAttribute("node", this@Node)
             addServlet(DataUploadServlet::class.java, "/upload/*")
@@ -115,6 +128,16 @@ class Node(dir: Path, val p2pAddr: HostAndPort, val webServerAddr: HostAndPort,
                 resourceConfig.register(customAPI)
             }
 
+            val staticDirMaps = pluginRegistries.map { x -> x.staticServeDirs }
+            val staticDirs = staticDirMaps.flatMap { it.keys }.zip(staticDirMaps.flatMap { it.values })
+            staticDirs.forEach {
+                val staticDir = ServletHolder(DefaultServlet::class.java)
+                staticDir.setInitParameter("resourceBase", it.second)
+                staticDir.setInitParameter("dirAllowed", "true")
+                staticDir.setInitParameter("pathInfoOnly", "true")
+                addServlet(staticDir, "/web/${it.first}/*")
+            }
+
             // Give the app a slightly better name in JMX rather than a randomly generated one and enable JMX
             resourceConfig.addProperties(mapOf(ServerProperties.APPLICATION_NAME to "node.api",
                     ServerProperties.MONITORING_STATISTICS_MBEANS_ENABLED to "true"))
@@ -123,11 +146,7 @@ class Node(dir: Path, val p2pAddr: HostAndPort, val webServerAddr: HostAndPort,
             val jerseyServlet = ServletHolder(container)
             addServlet(jerseyServlet, "/api/*")
             jerseyServlet.initOrder = 0 // Initialise at server start
-        })
-
-        server.handler = handlerCollection
-        server.start()
-        return server
+        }
     }
 
     override fun start(): Node {

node/src/main/kotlin/com/r3corda/node/services/clientapi/NodeInterestRates.kt

@@ -102,7 +102,7 @@ object NodeInterestRates {
         class FixingServicePlugin : CordaPluginRegistry {
             override val webApis: List<Class<*>> = emptyList()
             override val requiredProtocols: Map<String, Set<String>> = mapOf(Pair(TwoPartyDealProtocol.FixingRoleDecider::class.java.name, setOf(Duration::class.java.name, StateRef::class.java.name)))
-
+            override val staticServeDirs: Map<String, String> = emptyMap()
         }
 
         // File upload support

node/src/main/kotlin/com/r3corda/node/services/statemachine/FiberRequest.kt

@@ -68,6 +68,10 @@ sealed class FiberRequest(val topic: String,
         override fun toString(): String {
             return "Expecting response via topic ${receiveTopic} of type ${responseTypeName}"
         }
+
+        // We have to do an unchecked cast, but unless the serialized form is damaged, this was
+        // correct when the request was instantiated
+        @Suppress("UNCHECKED_CAST")
         val responseType: Class<R>
             get() = Class.forName(responseTypeName) as Class<R>
     }

node/src/main/kotlin/com/r3corda/node/services/statemachine/ProtocolStateMachineImpl.kt

@@ -109,9 +109,10 @@ class ProtocolStateMachineImpl<R>(val logic: ProtocolLogic<R>,
             try {
                 suspendAction(with)
             } catch (t: Throwable) {
+                // Do not throw exception again - Quasar completely bins it.
                 logger.warn("Captured exception which was swallowed by Quasar", t)
-                // TODO to throw or not to throw, that is the question
-                throw t
+                actionOnEnd()
+                _resultFuture?.setException(t)
             }
         }
     }

node/src/test/kotlin/com/r3corda/node/services/persistence/PerFileCheckpointStorageTests.kt

@@ -96,7 +96,7 @@ class PerFileCheckpointStorageTests {
 
     private var checkpointCount = 1
     private val request = FiberRequest.ExpectingResponse("topic", null, random63BitValue(), random63BitValue(), null,
-            java.lang.String::class.java)
+            kotlin.String::class.java)
     private fun newCheckpoint() = Checkpoint(SerializedBytes(Ints.toByteArray(checkpointCount++)), request)
 
 }