Moved webserver to root project.

build.gradle

@@ -131,7 +131,7 @@ dependencies {
     compile "com.google.guava:guava:$guava_version"
 
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
 
     // For the buildCordappDependenciesJar task
     runtime project(':client:jfx')
@@ -139,7 +139,7 @@ dependencies {
     runtime project(':client:rpc')
     runtime project(':core')
     runtime project(':finance')
-    runtime project(':client:webserver')
+    runtime project(':webserver')
     testCompile project(':test-utils')
 }
 

docs/source/example-code/build.gradle

@@ -50,7 +50,7 @@ dependencies {
     }
 
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
 }
 
 mainClassName = "net.corda.docs.ClientRpcTutorialKt"

samples/attachment-demo/build.gradle

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

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

@@ -37,7 +37,7 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':client:jfx')
     compile project(':client:rpc')

samples/irs-demo/build.gradle

@@ -40,10 +40,10 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':finance')
-    compile project(':client:webserver')
+    compile project(':webserver')
     compile project(':test-utils')
 
     // Javax is required for webapis

samples/network-visualiser/build.gradle

@@ -13,7 +13,7 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':finance')
     testCompile project(':test-utils')

samples/raft-notary-demo/build.gradle

@@ -37,7 +37,7 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':client:jfx')
     compile project(':client:rpc')

samples/simm-valuation-demo/build.gradle

@@ -41,10 +41,10 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":client:webserver:webcapsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':node')
-    compile project(':client:webserver')
+    compile project(':webserver')
     compile project(':finance')
     testCompile project(':test-utils')
 

samples/trader-demo/build.gradle

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

settings.gradle

@@ -13,8 +13,8 @@ include 'client:jackson'
 include 'client:jfx'
 include 'client:mock'
 include 'client:rpc'
-include 'client:webserver'
-include 'client:webserver:webcapsule'
+include 'webserver'
+include 'webserver:webcapsule'
 include 'experimental'
 include 'experimental:sandbox'
 include 'verifier'

test-utils/build.gradle

@@ -14,7 +14,7 @@ dependencies {
     compile project(':finance')
     compile project(':core')
     compile project(':node')
-    compile project(':client:webserver')
+    compile project(':webserver')
     compile project(':verifier')
 
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

tools/demobench/build.gradle

@@ -107,7 +107,7 @@ distributions {
                 rename 'corda-(.*)', 'corda.jar'
                 into 'corda'
             }
-            from(project(':client:webserver:webcapsule').tasks.buildWebserverJar) {
+            from(project(':webserver:webcapsule').tasks.buildWebserverJar) {
                 rename 'corda-webserver-(.*)', 'corda-webserver.jar'
                 into 'corda'
             }

webserver/webcapsule/build.gradle

@@ -33,7 +33,7 @@ sourceSets {
 }
 
 dependencies {
-    compile project(':client:webserver')
+    compile project(':webserver')
 }
 
 task buildWebserverJar(type: FatCapsule) {