Renamec capsule module to corda.

build.gradle

@@ -92,7 +92,7 @@ repositories {
 dependencies {
     compile project(':node')
     compile "com.google.guava:guava:19.0"
-    runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
 }
 
 task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
@@ -162,7 +162,7 @@ bintrayConfig {
     projectUrl = 'https://github.com/corda/corda'
     gpgSign = true
     gpgPassphrase = System.getenv('CORDA_BINTRAY_GPG_PASSPHRASE')
-    publications = ['client', 'core', 'finance', 'node', 'test-utils']
+    publications = ['client', 'core', 'corda', 'finance', 'node', 'test-utils']
     license {
         name = 'Apache-2.0'
         url = 'https://www.apache.org/licenses/LICENSE-2.0'

docs/source/example-code/build.gradle

@@ -36,7 +36,7 @@ sourceSets {
     }
 }
 
-compileTestJava.dependsOn tasks.getByPath(':node:capsule:buildCordaJAR')
+compileTestJava.dependsOn tasks.getByPath(':node:corda:buildCordaJAR')
 
 dependencies {
     compile project(':core')
@@ -48,7 +48,7 @@ dependencies {
         exclude group: "bouncycastle"
     }
 
-    runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
 }
 
 mainClassName = "net.corda.docs.ClientRpcTutorialKt"

gradle-plugins/build.gradle

@@ -16,7 +16,6 @@ buildscript {
     }
 }
 
-apply plugin: 'maven-publish'
 apply plugin: 'net.corda.plugins.publish-utils'
 
 allprojects {
@@ -24,10 +23,6 @@ allprojects {
     group 'net.corda.plugins'
 }
 
-subprojects {
-	task(install, dependsOn: 'publishToMavenLocal')
-}
-
 bintrayConfig {
     user = System.getenv('CORDA_BINTRAY_USER')
     key = System.getenv('CORDA_BINTRAY_KEY')
@@ -49,8 +44,4 @@ bintrayConfig {
         name = 'R3'
         email = 'dev@corda.net'
     }
-}
-
-// Aliasing the publishToMavenLocal for simplicity.
-task(install, dependsOn: 'publishToMavenLocal')
-
+}

gradle-plugins/publish-utils/build.gradle

@@ -81,3 +81,6 @@ publishing {
         }
     }
 }
+
+// Aliasing the publishToMavenLocal for simplicity.
+task(install, dependsOn: 'publishToMavenLocal')

gradle-plugins/publish-utils/src/main/groovy/net/corda/plugins/PublishTasks.groovy

@@ -24,6 +24,7 @@ class PublishTasks implements Plugin<Project> {
 
         createTasks()
         createExtensions()
+        createConfigurations()
         checkAndConfigurePublishing()
     }
 
@@ -53,6 +54,11 @@ class PublishTasks implements Plugin<Project> {
             artifact project.tasks.sourceJar
             artifact project.tasks.javadocJar
 
+            project.configurations.publish.artifacts.each {
+                println("Adding artifact: $it")
+                delegate.artifact it
+            }
+
             extendPomForMavenCentral(pom, bintrayConfig)
         }
         project.task("install", dependsOn: "publishToMavenLocal")
@@ -125,4 +131,8 @@ class PublishTasks implements Plugin<Project> {
             project.extensions.create("bintrayConfig", BintrayConfigExtension)
         }
     }
+
+    void createConfigurations() {
+        project.configurations.create("publish")
+    }
 }

node/corda/build.gradle

@@ -5,9 +5,7 @@
 apply plugin: 'net.corda.plugins.publish-utils'
 apply plugin: 'us.kirchmeier.capsule'
 apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
 
-//name 'corda'
 description 'Corda standalone node'
 
 repositories {
@@ -37,12 +35,12 @@ targetCompatibility = 1.6
 sourceSets {
     test {
         resources {
-            srcDir "../config/test"
+            srcDir "../../config/test"
         }
     }
     main {
         resources {
-            srcDir "../config/dev"
+            srcDir "../../config/dev"
         }
     }
 }
@@ -75,4 +73,7 @@ task buildCertSigningRequestUtilityJAR(type: FatCapsule, dependsOn: project.jar)
 
 artifacts {
     runtimeArtifacts buildCordaJAR
+    publish buildCordaJAR {
+        classifier ""
+    }
 }

samples/attachment-demo/build.gradle

@@ -45,7 +45,7 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
 
     // Corda integration dependencies
-    runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':client')
     compile project(':node')

samples/irs-demo/build.gradle

@@ -48,7 +48,7 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
 
     // Corda integration dependencies
-    runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':client')
     compile project(':node')

samples/network-visualiser/build.gradle

@@ -21,7 +21,7 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
 
     // Corda integration dependencies
-    runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':client')
     compile project(':node')

samples/raft-notary-demo/build.gradle

@@ -45,7 +45,7 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
 
     // Corda integration dependencies
-    runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':client')
     compile project(':node')

samples/simm-valuation-demo/build.gradle

@@ -41,7 +41,7 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
 
     // Corda integration dependencies
-    runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':client')
     compile project(':node')

samples/trader-demo/build.gradle

@@ -45,7 +45,7 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
 
     // Corda integration dependencies
-    runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:corda", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':client')
     compile project(':node')

settings.gradle

@@ -5,7 +5,7 @@ include 'finance'
 include 'finance:isolated'
 include 'core'
 include 'node'
-include 'node:capsule'
+include 'node:corda'
 include 'client'
 include 'experimental'
 include 'experimental:sandbox'