Renamed webserver capsule to webcapsule module to avoid clashes with the node capsule

build.gradle

@@ -119,7 +119,7 @@ dependencies {
     compile project(':node')
     compile "com.google.guava:guava:$guava_version"
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
 }
 
 task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {

docs/source/example-code/build.gradle

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

node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/Models.java

@@ -8,9 +8,9 @@ import javax.annotation.Generated;
 @Generated("io.requery.processor.EntityProcessor")
 public class Models {
     public static final EntityModel VAULT = new EntityModelBuilder("vault")
+    .addType(VaultStatesEntity.$TYPE)
     .addType(VaultTxnNoteEntity.$TYPE)
     .addType(VaultCashBalancesEntity.$TYPE)
-    .addType(VaultStatesEntity.$TYPE)
     .build();
 
     private Models() {

samples/attachment-demo/build.gradle

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

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

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

samples/irs-demo/build.gradle

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

samples/network-visualiser/build.gradle

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

samples/raft-notary-demo/build.gradle

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

samples/simm-valuation-demo/build.gradle

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

samples/trader-demo/build.gradle

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

settings.gradle

@@ -8,7 +8,7 @@ include 'node-schemas'
 include 'node'
 include 'node:capsule'
 include 'node:webserver'
-include 'node:webserver:capsule'
+include 'node:webserver:webcapsule'
 include 'client'
 include 'client:jackson'
 include 'experimental'