Refactor :client module into :client:javafx and :client:mock (#388)

* CORDA-304: Refactor :client modules into :client:javafx and :client:mock.

* CORDA-304: Add :client:mock to Dokka tasks, and remove unused integrationTest task.

* CORDA-304: Migrate DriverBasedTest from node into test-utils.

* CORDA-304: Rename .fx. package to .jfx. to prevent confusion with "exchange rate".

* CORDA-304: Rename module to ':client:jfx'.

build.gradle

@@ -125,7 +125,8 @@ dependencies {
     runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
 
     // For the buildCordappDependenciesJar task
-    runtime project(':client')
+    runtime project(':client:jfx')
+    runtime project(':client:mock')
     runtime project(':core')
     runtime project(':finance')
     runtime project(':node:webserver')
@@ -197,7 +198,7 @@ bintrayConfig {
     projectUrl = 'https://github.com/corda/corda'
     gpgSign = true
     gpgPassphrase = System.getenv('CORDA_BINTRAY_GPG_PASSPHRASE')
-    publications = ['client', 'core', 'corda', 'corda-webserver', 'finance', 'node', 'node-api', 'node-schemas', 'test-utils', 'jackson', 'webserver']
+    publications = ['jfx', 'mock', 'core', 'corda', 'corda-webserver', 'finance', 'node', 'node-api', 'node-schemas', 'test-utils', 'jackson', 'webserver']
     license {
         name = 'Apache-2.0'
         url = 'https://www.apache.org/licenses/LICENSE-2.0'
@@ -216,7 +217,7 @@ dokka {
     moduleName = 'corda'
     outputDirectory = 'docs/build/html/api/kotlin'
     processConfigurations = ['compile']
-    sourceDirs = files('core/src/main/kotlin', 'client/src/main/kotlin', 'node/src/main/kotlin', 'finance/src/main/kotlin', 'client/jackson/src/main/kotlin')
+    sourceDirs = files('core/src/main/kotlin', 'client/jfx/src/main/kotlin', 'client/mock/src/main/kotlin', 'node/src/main/kotlin', 'finance/src/main/kotlin', 'client/jackson/src/main/kotlin')
 }
 
 task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
@@ -224,7 +225,7 @@ task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
     outputFormat = "javadoc"
     outputDirectory = 'docs/build/html/api/javadoc'
     processConfigurations = ['compile']
-    sourceDirs = files('core/src/main/kotlin', 'client/src/main/kotlin', 'node/src/main/kotlin', 'finance/src/main/kotlin', 'client/jackson/src/main/kotlin')
+    sourceDirs = files('core/src/main/kotlin', 'client/jfx/src/main/kotlin', 'client/mock/src/main/kotlin', 'node/src/main/kotlin', 'finance/src/main/kotlin', 'client/jackson/src/main/kotlin')
 }
 
 task apidocs(dependsOn: ['dokka', 'dokkaJavadoc'])

client/jfx/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'kotlin'
 apply plugin: 'net.corda.plugins.quasar-utils'
 apply plugin: 'net.corda.plugins.publish-utils'
 
-description 'Corda client modules'
+description 'Corda client JavaFX modules'
 
 repositories {
     mavenLocal()
@@ -35,7 +35,7 @@ sourceSets {
     }
     test {
         resources {
-            srcDir "../config/test"
+            srcDir "../../config/test"
         }
     }
 }

client/jfx/src/integration-test/kotlin/net/corda/client/jfx/CordaRPCClientTest.kt

@@ -1,4 +1,4 @@
-package net.corda.client
+package net.corda.client.jfx
 
 import net.corda.core.contracts.DOLLARS
 import net.corda.core.flows.FlowException

client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt

@@ -1,7 +1,7 @@
-package net.corda.client
+package net.corda.client.jfx
 
-import net.corda.client.model.NodeMonitorModel
+import net.corda.client.jfx.model.NodeMonitorModel
-import net.corda.client.model.ProgressTrackingEvent
+import net.corda.client.jfx.model.ProgressTrackingEvent
 import net.corda.core.bufferUntilSubscribed
 import net.corda.core.contracts.Amount
 import net.corda.core.contracts.DOLLARS
@@ -21,7 +21,6 @@ import net.corda.core.transactions.SignedTransaction
 import net.corda.flows.CashExitFlow
 import net.corda.flows.CashIssueFlow
 import net.corda.flows.CashPaymentFlow
-import net.corda.node.driver.DriverBasedTest
 import net.corda.node.driver.driver
 import net.corda.node.services.User
 import net.corda.node.services.network.NetworkMapService
@@ -29,6 +28,7 @@ import net.corda.node.services.startFlowPermission
 import net.corda.node.services.transactions.SimpleNotaryService
 import net.corda.testing.expect
 import net.corda.testing.expectEvents
+import net.corda.testing.node.DriverBasedTest
 import net.corda.testing.sequence
 import org.junit.Test
 import rx.Observable

client/jfx/src/main/kotlin/net/corda/client/jfx/model/ContractStateModel.kt

@@ -1,10 +1,10 @@
-package net.corda.client.model
+package net.corda.client.jfx.model
 
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList
 import kotlinx.support.jdk8.collections.removeIf
-import net.corda.client.fxutils.fold
+import net.corda.client.jfx.utils.fold
-import net.corda.client.fxutils.map
+import net.corda.client.jfx.utils.map
 import net.corda.contracts.asset.Cash
 import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.StateAndRef

client/jfx/src/main/kotlin/net/corda/client/jfx/model/ExchangeRateModel.kt

@@ -1,4 +1,4 @@
-package net.corda.client.model
+package net.corda.client.jfx.model
 
 import javafx.beans.property.SimpleObjectProperty
 import javafx.beans.value.ObservableValue

client/jfx/src/main/kotlin/net/corda/client/jfx/model/Models.kt

@@ -1,4 +1,4 @@
-package net.corda.client.model
+package net.corda.client.jfx.model
 
 import javafx.beans.property.ObjectProperty
 import javafx.beans.value.ObservableValue

client/jfx/src/main/kotlin/net/corda/client/jfx/model/NetworkIdentityModel.kt

@@ -1,13 +1,13 @@
-package net.corda.client.model
+package net.corda.client.jfx.model
 
 import javafx.beans.value.ObservableValue
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList
 import kotlinx.support.jdk8.collections.removeIf
-import net.corda.client.fxutils.firstOrDefault
+import net.corda.client.jfx.utils.firstOrDefault
-import net.corda.client.fxutils.firstOrNullObservable
+import net.corda.client.jfx.utils.firstOrNullObservable
-import net.corda.client.fxutils.fold
+import net.corda.client.jfx.utils.fold
-import net.corda.client.fxutils.map
+import net.corda.client.jfx.utils.map
 import net.corda.core.crypto.CompositeKey
 import net.corda.core.node.NodeInfo
 import net.corda.core.node.services.NetworkMapCache.MapChange
@@ -48,4 +48,4 @@ class NetworkIdentityModel {
     fun lookup(publicKey: PublicKey): ObservableValue<NodeInfo?> = parties.firstOrDefault(notaries.firstOrNullObservable { it.notaryIdentity.owningKey.keys.any { it == publicKey } }) {
         it.legalIdentity.owningKey.keys.any { it == publicKey }
     }
-}
+}

client/jfx/src/main/kotlin/net/corda/client/jfx/model/NodeMonitorModel.kt

@@ -1,8 +1,7 @@
-package net.corda.client.model
+package net.corda.client.jfx.model
 
 import com.google.common.net.HostAndPort
 import javafx.beans.property.SimpleObjectProperty
-import net.corda.nodeapi.config.SSLConfiguration
 import net.corda.core.flows.StateMachineRunId
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.StateMachineInfo
@@ -97,4 +96,4 @@ class NodeMonitorModel {
 
         proxyObservable.set(proxy)
     }
-}
+}

client/jfx/src/main/kotlin/net/corda/client/jfx/model/TransactionDataModel.kt

@@ -1,11 +1,11 @@
-package net.corda.client.model
+package net.corda.client.jfx.model
 
 import javafx.beans.property.SimpleObjectProperty
 import javafx.beans.value.ObservableValue
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList
 import javafx.collections.ObservableMap
-import net.corda.client.fxutils.*
+import net.corda.client.jfx.utils.*
 import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.contracts.StateRef

client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AggregatedList.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
 import javafx.collections.ListChangeListener

client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AmountBindings.kt

@@ -1,10 +1,10 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.beans.binding.Bindings
 import javafx.beans.value.ObservableValue
 import javafx.collections.ObservableList
 import kotlinx.support.jdk8.collections.stream
-import net.corda.client.model.ExchangeRate
+import net.corda.client.jfx.model.ExchangeRate
 import net.corda.core.contracts.Amount
 import org.fxmisc.easybind.EasyBind
 import java.util.*

client/jfx/src/main/kotlin/net/corda/client/jfx/utils/AssociatedList.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.ListChangeListener
 import javafx.collections.ObservableList

client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ChosenList.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.beans.Observable
 import javafx.beans.value.ObservableValue

client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ConcatenatedList.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import co.paralleluniverse.common.util.VisibleForTesting
 import javafx.collections.ListChangeListener

client/jfx/src/main/kotlin/net/corda/client/jfx/utils/FlattenedList.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.beans.value.ChangeListener
 import javafx.beans.value.ObservableValue

client/jfx/src/main/kotlin/net/corda/client/jfx/utils/LeftOuterJoinedMap.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.beans.property.SimpleObjectProperty
 import javafx.beans.value.ObservableValue

client/jfx/src/main/kotlin/net/corda/client/jfx/utils/MapValuesList.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
 import javafx.collections.MapChangeListener

client/jfx/src/main/kotlin/net/corda/client/jfx/utils/MappedList.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.ListChangeListener
 import javafx.collections.ObservableList

client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ObservableFold.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.application.Platform
 import javafx.beans.property.SimpleObjectProperty

client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ObservableUtilities.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.beans.binding.Bindings
 import javafx.beans.binding.BooleanBinding
@@ -306,4 +306,4 @@ fun <A> ObservableList<A>.firstOrDefault(default: ObservableValue<A?>, predicate
  */
 fun <A> ObservableList<A>.firstOrNullObservable(predicate: (A) -> Boolean): ObservableValue<A?> {
     return Bindings.createObjectBinding({ this.firstOrNull(predicate) }, arrayOf(this))
-}
+}

client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ReadOnlyBackedObservableMapBase.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import com.sun.javafx.collections.MapListenerHelper
 import javafx.beans.InvalidationListener

client/jfx/src/main/kotlin/net/corda/client/jfx/utils/ReplayedList.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.ListChangeListener
 import javafx.collections.ObservableList

client/jfx/src/test/kotlin/net/corda/client/jfx/utils/AggregatedListTest.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList

client/jfx/src/test/kotlin/net/corda/client/jfx/utils/AssociatedListTest.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList

client/jfx/src/test/kotlin/net/corda/client/jfx/utils/ConcatenatedListTest.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList

client/jfx/src/test/kotlin/net/corda/client/jfx/utils/FlattenedListTest.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.beans.property.SimpleObjectProperty
 import javafx.collections.FXCollections

client/jfx/src/test/kotlin/net/corda/client/jfx/utils/LeftOuterJoinedMapTest.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList

client/jfx/src/test/kotlin/net/corda/client/jfx/utils/MappedListTest.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
 import javafx.collections.ObservableList

client/jfx/src/test/kotlin/net/corda/client/jfx/utils/ReplayedListTest.kt

@@ -1,13 +1,14 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.FXCollections
+import javafx.collections.ObservableList
 import org.junit.Before
 import org.junit.Test
 import kotlin.test.assertEquals
 
 class ReplayedListTest {
 
-    var sourceList = FXCollections.observableArrayList(1234)
+    var sourceList: ObservableList<Int> = FXCollections.observableArrayList(1234)
     var replayedList = ReplayedList(sourceList)
 
     @Before

client/jfx/src/test/kotlin/net/corda/client/jfx/utils/ReplayedMap.kt

@@ -1,4 +1,4 @@
-package net.corda.client.fxutils
+package net.corda.client.jfx.utils
 
 import javafx.collections.MapChangeListener
 import javafx.collections.ObservableMap

client/mock/build.gradle

@@ -0,0 +1,44 @@
+apply plugin: 'kotlin'
+apply plugin: 'net.corda.plugins.quasar-utils'
+apply plugin: 'net.corda.plugins.publish-utils'
+
+description 'Corda client mock modules'
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven {
+        url 'http://oss.sonatype.org/content/repositories/snapshots'
+    }
+    jcenter()
+    maven {
+        url 'https://dl.bintray.com/kotlin/exposed'
+    }
+}
+
+//noinspection GroovyAssignabilityCheck
+configurations {
+    // we don't want isolated.jar in classPath, since we want to test jar being dynamically loaded as an attachment
+    runtime.exclude module: 'isolated'
+}
+
+sourceSets {
+    test {
+        resources {
+            srcDir "../../config/test"
+        }
+    }
+}
+
+// To find potential version conflicts, run "gradle htmlDependencyReport" and then look in
+// build/reports/project/dependencies/index.html for green highlighted parts of the tree.
+
+dependencies {
+    compile project(":node")
+
+    // Unit testing helpers.
+    testCompile "junit:junit:$junit_version"
+    testCompile "org.assertj:assertj-core:${assertj_version}"
+
+    testCompile project(':test-utils')
+}

client/mock/src/main/kotlin/net/corda/client/mock/EventGenerator.kt

@@ -99,4 +99,4 @@ class EventGenerator(
     val bankOfCordaIssueGenerator = Generator.frequency(
             0.6 to issueCashGenerator
     )
-}
+}

docs/source/example-code/build.gradle

@@ -40,7 +40,7 @@ compileTestJava.dependsOn tasks.getByPath(':node:capsule:buildCordaJAR')
 
 dependencies {
     compile project(':core')
-    compile project(':client')
+    compile project(':client:jfx')
     testCompile project(':test-utils')
 
     compile "org.graphstream:gs-core:1.3"

node/build.gradle

@@ -126,7 +126,7 @@ dependencies {
     testCompile "com.pholser:junit-quickcheck-core:$quickcheck_version"
     testCompile "com.nhaarman:mockito-kotlin:1.1.0"
     testCompile project(':test-utils')
-    testCompile project(':client')
+    testCompile project(':client:jfx')
     testCompile project(':core')
 
     // For H2 database support in persistence

node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt

@@ -13,12 +13,12 @@ import net.corda.core.node.NodeInfo
 import net.corda.core.serialization.OpaqueBytes
 import net.corda.flows.CashIssueFlow
 import net.corda.flows.CashPaymentFlow
-import net.corda.node.driver.DriverBasedTest
 import net.corda.node.driver.NodeHandle
 import net.corda.node.driver.driver
 import net.corda.node.services.transactions.RaftValidatingNotaryService
 import net.corda.testing.expect
 import net.corda.testing.expectEvents
+import net.corda.testing.node.DriverBasedTest
 import net.corda.testing.replicate
 import org.junit.Test
 import rx.Observable

samples/bank-of-corda-demo/build.gradle

@@ -48,7 +48,7 @@ dependencies {
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
     runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
-    compile project(':client')
+    compile project(':client:jfx')
     compile project(':node')
     compile project(':finance')
     compile project(':test-utils')

samples/raft-notary-demo/build.gradle

@@ -48,7 +48,7 @@ dependencies {
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
     runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
-    compile project(':client')
+    compile project(':client:jfx')
     compile project(':node')
     compile project(':test-utils')
 

settings.gradle

@@ -10,8 +10,9 @@ include 'node'
 include 'node:capsule'
 include 'node:webserver'
 include 'node:webserver:webcapsule'
-include 'client'
 include 'client:jackson'
+include 'client:jfx'
+include 'client:mock'
 include 'experimental'
 include 'experimental:sandbox'
 include 'test-utils'

test-utils/src/main/kotlin/net/corda/testing/node/DriverBasedTest.kt

@@ -1,5 +1,6 @@
-package net.corda.node.driver
+package net.corda.testing.node
 
+import net.corda.node.driver.DriverDSLExposedInterface
 import org.junit.After
 import org.junit.Before
 import java.util.concurrent.CountDownLatch

tools/explorer/build.gradle

@@ -40,7 +40,8 @@ dependencies {
 
     // Corda Core: Data structures and basic types needed to work with Corda.
     compile project(':core')
-    compile project(':client')
+    compile project(':client:jfx')
+    compile project(':client:mock')
     compile project(':node')
     compile project(':finance')
 

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

@@ -9,9 +9,9 @@ import javafx.scene.image.Image
 import javafx.stage.Stage
 import jfxtras.resources.JFXtrasFontRoboto
 import joptsimple.OptionParser
+import net.corda.client.jfx.model.Models
+import net.corda.client.jfx.model.observableValue
 import net.corda.client.mock.EventGenerator
-import net.corda.client.model.Models
-import net.corda.client.model.observableValue
 import net.corda.core.contracts.GBP
 import net.corda.core.contracts.USD
 import net.corda.core.node.services.ServiceInfo

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

@@ -1,11 +1,11 @@
 package net.corda.explorer.model
 
 import javafx.collections.ObservableList
-import net.corda.client.fxutils.ChosenList
+import net.corda.client.jfx.utils.ChosenList
-import net.corda.client.fxutils.map
+import net.corda.client.jfx.utils.map
-import net.corda.client.model.NetworkIdentityModel
+import net.corda.client.jfx.model.NetworkIdentityModel
-import net.corda.client.model.observableList
+import net.corda.client.jfx.model.observableList
-import net.corda.client.model.observableValue
+import net.corda.client.jfx.model.observableValue
 import net.corda.core.contracts.currency
 import net.corda.core.node.NodeInfo
 import tornadofx.observable

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

@@ -1,10 +1,10 @@
 package net.corda.explorer.model
 
 import javafx.beans.value.ObservableValue
-import net.corda.client.fxutils.AmountBindings
+import net.corda.client.jfx.utils.AmountBindings
-import net.corda.client.model.ExchangeRate
+import net.corda.client.jfx.model.ExchangeRate
-import net.corda.client.model.ExchangeRateModel
+import net.corda.client.jfx.model.ExchangeRateModel
-import net.corda.client.model.observableValue
+import net.corda.client.jfx.model.observableValue
 import net.corda.core.contracts.Amount
 import net.corda.core.contracts.CHF
 import net.corda.core.contracts.GBP

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

@@ -8,10 +8,10 @@ import javafx.scene.Parent
 import javafx.scene.control.TitledPane
 import javafx.scene.input.MouseButton
 import javafx.scene.layout.TilePane
-import net.corda.client.fxutils.concatenate
+import net.corda.client.jfx.model.observableList
-import net.corda.client.fxutils.map
+import net.corda.client.jfx.model.writableValue
-import net.corda.client.model.observableList
+import net.corda.client.jfx.utils.concatenate
-import net.corda.client.model.writableValue
+import net.corda.client.jfx.utils.map
 import net.corda.explorer.model.CordaView
 import net.corda.explorer.model.CordaViewModel
 

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

@@ -10,9 +10,9 @@ import javafx.scene.layout.GridPane
 import javafx.scene.layout.Priority
 import javafx.scene.text.TextAlignment
 import javafx.util.StringConverter
-import net.corda.client.fxutils.map
+import net.corda.client.jfx.model.Models
-import net.corda.client.model.Models
+import net.corda.client.jfx.model.NetworkIdentityModel
-import net.corda.client.model.NetworkIdentityModel
+import net.corda.client.jfx.utils.map
 import net.corda.contracts.asset.Cash
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.crypto.AnonymousParty

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

@@ -3,8 +3,8 @@ package net.corda.explorer.views
 import com.google.common.net.HostAndPort
 import javafx.beans.property.SimpleIntegerProperty
 import javafx.scene.control.*
-import net.corda.client.model.NodeMonitorModel
+import net.corda.client.jfx.model.NodeMonitorModel
-import net.corda.client.model.objectProperty
+import net.corda.client.jfx.model.objectProperty
 import net.corda.explorer.model.SettingsModel
 import org.controlsfx.dialog.ExceptionDialog
 import tornadofx.*

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

@@ -17,12 +17,12 @@ import javafx.scene.text.Font
 import javafx.scene.text.TextAlignment
 import javafx.stage.Stage
 import javafx.stage.WindowEvent
-import net.corda.client.fxutils.ChosenList
+import net.corda.client.jfx.model.NetworkIdentityModel
-import net.corda.client.fxutils.map
+import net.corda.client.jfx.model.objectProperty
-import net.corda.client.model.NetworkIdentityModel
+import net.corda.client.jfx.model.observableList
-import net.corda.client.model.objectProperty
+import net.corda.client.jfx.model.observableValue
-import net.corda.client.model.observableList
+import net.corda.client.jfx.utils.ChosenList
-import net.corda.client.model.observableValue
+import net.corda.client.jfx.utils.map
 import net.corda.explorer.model.CordaViewModel
 import tornadofx.*
 

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

@@ -23,8 +23,8 @@ import javafx.scene.shape.Line
 import javafx.scene.text.Font
 import javafx.scene.text.FontWeight
 import javafx.util.Duration
-import net.corda.client.fxutils.*
+import net.corda.client.jfx.model.*
-import net.corda.client.model.*
+import net.corda.client.jfx.utils.*
 import net.corda.core.contracts.ContractState
 import net.corda.core.crypto.Party
 import net.corda.core.node.NodeInfo

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

@@ -14,8 +14,8 @@ import javafx.scene.control.ListCell
 import javafx.scene.control.TextField
 import javafx.scene.input.MouseButton
 import javafx.scene.input.MouseEvent
-import net.corda.client.fxutils.ChosenList
+import net.corda.client.jfx.utils.ChosenList
-import net.corda.client.fxutils.map
+import net.corda.client.jfx.utils.map
 import tornadofx.UIComponent
 import tornadofx.observable
 

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

@@ -8,9 +8,9 @@ import javafx.scene.control.CheckBox
 import javafx.scene.control.ComboBox
 import javafx.scene.control.Label
 import javafx.scene.control.TextField
-import net.corda.client.fxutils.map
+import net.corda.client.jfx.model.objectProperty
-import net.corda.client.model.objectProperty
+import net.corda.client.jfx.model.observableList
-import net.corda.client.model.observableList
+import net.corda.client.jfx.utils.map
 import net.corda.explorer.model.CordaView
 import net.corda.explorer.model.ReportingCurrencyModel
 import net.corda.explorer.model.SettingsModel

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

@@ -15,11 +15,11 @@ import javafx.scene.control.TableView
 import javafx.scene.control.TitledPane
 import javafx.scene.layout.BorderPane
 import javafx.scene.layout.VBox
-import net.corda.client.fxutils.filterNotNull
+import net.corda.client.jfx.model.*
-import net.corda.client.fxutils.lift
+import net.corda.client.jfx.utils.filterNotNull
-import net.corda.client.fxutils.map
+import net.corda.client.jfx.utils.lift
-import net.corda.client.fxutils.sequence
+import net.corda.client.jfx.utils.map
-import net.corda.client.model.*
+import net.corda.client.jfx.utils.sequence
 import net.corda.contracts.asset.Cash
 import net.corda.core.contracts.*
 import net.corda.core.crypto.AbstractParty

tools/explorer/src/main/kotlin/net/corda/explorer/views/cordapps/cash/CashViewer.kt

@@ -17,8 +17,8 @@ import javafx.scene.layout.BorderPane
 import javafx.scene.layout.HBox
 import javafx.scene.layout.Priority
 import javafx.scene.layout.VBox
-import net.corda.client.fxutils.*
+import net.corda.client.jfx.utils.*
-import net.corda.client.model.*
+import net.corda.client.jfx.model.*
 import net.corda.contracts.asset.Cash
 import net.corda.core.contracts.Amount
 import net.corda.core.contracts.StateAndRef

tools/explorer/src/main/kotlin/net/corda/explorer/views/cordapps/cash/NewTransaction.kt

@@ -12,11 +12,11 @@ import javafx.scene.layout.GridPane
 import javafx.scene.text.Font
 import javafx.scene.text.FontWeight
 import javafx.stage.Window
-import net.corda.client.fxutils.ChosenList
+import net.corda.client.jfx.model.*
-import net.corda.client.fxutils.isNotNull
+import net.corda.client.jfx.utils.ChosenList
-import net.corda.client.fxutils.map
+import net.corda.client.jfx.utils.isNotNull
-import net.corda.client.fxutils.unique
+import net.corda.client.jfx.utils.map
-import net.corda.client.model.*
+import net.corda.client.jfx.utils.unique
 import net.corda.core.contracts.Amount
 import net.corda.core.contracts.withoutIssuer
 import net.corda.core.crypto.AbstractParty

tools/loadtest/build.gradle

@@ -24,7 +24,7 @@ sourceSets {
 mainClassName = 'net.corda.loadtest.MainKt'
 
 dependencies {
-    compile project(':client')
+    compile project(':client:mock')
 
     // https://mvnrepository.com/artifact/com.jcraft/jsch
     compile group: 'com.jcraft', name: 'jsch', version: '0.1.54'

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

@@ -5,7 +5,6 @@ import com.typesafe.config.ConfigParseOptions
 import net.corda.loadtest.tests.crossCashTest
 import net.corda.loadtest.tests.selfIssueTest
 import java.io.File
-import java.nio.file.Paths
 
 /**
  * This is how load testing works: