Merged in clint-contractsrename (pull request #446)

Renamed contracts project to finance to better reflect the purpose of the project.

.idea/modules.xml

@@ -9,9 +9,6 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/client/client_integrationTest.iml" filepath="$PROJECT_DIR$/.idea/modules/client/client_integrationTest.iml" group="client" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/client/client_main.iml" filepath="$PROJECT_DIR$/.idea/modules/client/client_main.iml" group="client" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/client/client_test.iml" filepath="$PROJECT_DIR$/.idea/modules/client/client_test.iml" group="client" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/contracts/contracts.iml" filepath="$PROJECT_DIR$/.idea/modules/contracts/contracts.iml" group="contracts" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/contracts/contracts_main.iml" filepath="$PROJECT_DIR$/.idea/modules/contracts/contracts_main.iml" group="contracts" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/contracts/contracts_test.iml" filepath="$PROJECT_DIR$/.idea/modules/contracts/contracts_test.iml" group="contracts" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/gradle-plugins/cordformation/cordformation.iml" filepath="$PROJECT_DIR$/.idea/modules/gradle-plugins/cordformation/cordformation.iml" group="gradle-plugins/cordformation" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/gradle-plugins/cordformation/cordformation_main.iml" filepath="$PROJECT_DIR$/.idea/modules/gradle-plugins/cordformation/cordformation_main.iml" group="gradle-plugins/cordformation" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/gradle-plugins/cordformation/cordformation_test.iml" filepath="$PROJECT_DIR$/.idea/modules/gradle-plugins/cordformation/cordformation_test.iml" group="gradle-plugins/cordformation" />
@@ -30,12 +27,15 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/tools/explorer/explorer.iml" filepath="$PROJECT_DIR$/.idea/modules/tools/explorer/explorer.iml" group="tools/explorer" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/tools/explorer/explorer_main.iml" filepath="$PROJECT_DIR$/.idea/modules/tools/explorer/explorer_main.iml" group="tools/explorer" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/tools/explorer/explorer_test.iml" filepath="$PROJECT_DIR$/.idea/modules/tools/explorer/explorer_test.iml" group="tools/explorer" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/finance/finance.iml" filepath="$PROJECT_DIR$/.idea/modules/finance/finance.iml" group="finance" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/finance/finance_main.iml" filepath="$PROJECT_DIR$/.idea/modules/finance/finance_main.iml" group="finance" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/finance/finance_test.iml" filepath="$PROJECT_DIR$/.idea/modules/finance/finance_test.iml" group="finance" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/gradle-plugins/gradle-plugins.iml" filepath="$PROJECT_DIR$/.idea/modules/gradle-plugins/gradle-plugins.iml" group="gradle-plugins" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/gradle-plugins/gradle-plugins_main.iml" filepath="$PROJECT_DIR$/.idea/modules/gradle-plugins/gradle-plugins_main.iml" group="gradle-plugins" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/gradle-plugins/gradle-plugins_test.iml" filepath="$PROJECT_DIR$/.idea/modules/gradle-plugins/gradle-plugins_test.iml" group="gradle-plugins" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/contracts/isolated/isolated.iml" filepath="$PROJECT_DIR$/.idea/modules/contracts/isolated/isolated.iml" group="contracts/isolated" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/contracts/isolated/isolated_main.iml" filepath="$PROJECT_DIR$/.idea/modules/contracts/isolated/isolated_main.iml" group="contracts/isolated" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/contracts/isolated/isolated_test.iml" filepath="$PROJECT_DIR$/.idea/modules/contracts/isolated/isolated_test.iml" group="contracts/isolated" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/finance/isolated/isolated.iml" filepath="$PROJECT_DIR$/.idea/modules/finance/isolated/isolated.iml" group="finance/isolated" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/finance/isolated/isolated_main.iml" filepath="$PROJECT_DIR$/.idea/modules/finance/isolated/isolated_main.iml" group="finance/isolated" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/finance/isolated/isolated_test.iml" filepath="$PROJECT_DIR$/.idea/modules/finance/isolated/isolated_test.iml" group="finance/isolated" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/node/node.iml" filepath="$PROJECT_DIR$/.idea/modules/node/node.iml" group="node" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/node/node_integrationTest.iml" filepath="$PROJECT_DIR$/.idea/modules/node/node_integrationTest.iml" group="node" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/node/node_main.iml" filepath="$PROJECT_DIR$/.idea/modules/node/node_main.iml" group="node" />
@@ -47,7 +47,6 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/gradle-plugins/quasar-utils/quasar-utils_main.iml" filepath="$PROJECT_DIR$/.idea/modules/gradle-plugins/quasar-utils/quasar-utils_main.iml" group="gradle-plugins/quasar-utils" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/gradle-plugins/quasar-utils/quasar-utils_test.iml" filepath="$PROJECT_DIR$/.idea/modules/gradle-plugins/quasar-utils/quasar-utils_test.iml" group="gradle-plugins/quasar-utils" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/r3prototyping.iml" filepath="$PROJECT_DIR$/.idea/modules/r3prototyping.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/r3prototyping_integrationTest.iml" filepath="$PROJECT_DIR$/.idea/modules/r3prototyping_integrationTest.iml" group="r3prototyping" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/r3prototyping_main.iml" filepath="$PROJECT_DIR$/.idea/modules/r3prototyping_main.iml" group="r3prototyping" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/r3prototyping_test.iml" filepath="$PROJECT_DIR$/.idea/modules/r3prototyping_test.iml" group="r3prototyping" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/docs/source/source.iml" filepath="$PROJECT_DIR$/.idea/modules/docs/source/source.iml" group="docs/source" />

build.gradle

@@ -149,4 +149,4 @@ publishing {
             }
         }
     }
-}
+}

client/build.gradle

@@ -80,7 +80,7 @@ dependencies {
     integrationTestCompile 'junit:junit:4.12'
 }
 
-quasarScan.dependsOn('classes', ':core:classes', ':contracts:classes')
+quasarScan.dependsOn('classes', ':core:classes', ':finance:classes')
 
 task integrationTest(type: Test) {
     testClassesDir = sourceSets.integrationTest.output.classesDir

docs/source/creating-a-cordapp.rst

@@ -103,7 +103,7 @@ root directory of Corda
 
     ./gradlew install
 
-This will publish corda-$version.jar, contracts-$version.jar, core-$version.jar and node-$version.jar to the
+This will publish corda-$version.jar, finance-$version.jar, core-$version.jar and node-$version.jar to the
 group com.r3corda. You can now depend on these as you normally would a Maven dependency.
 
 Gradle Plugins for Cordapps
@@ -165,7 +165,7 @@ To build against Corda and the plugins that cordapps use, update your build.grad
 
     dependencies {
         compile "com.r3corda:core:$corda_version"
-        compile "com.r3corda:contracts:$corda_version"
+        compile "com.r3corda:finance:$corda_version"
         compile "com.r3corda:node:$corda_version"
         compile "com.r3corda:corda:$corda_version"
         ... other dependencies here ...

docs/source/persistence.rst

@@ -85,5 +85,5 @@ to initialise the ORM layer.
 Several examples of entities and mappings are provided in the codebase, including ``Cash.State`` and
 ``CommercialPaper.State``.  For example, here's the first version of the cash schema.
 
-.. literalinclude:: ../../contracts/src/main/kotlin/com/r3corda/schemas/CashSchemaV1.kt
+.. literalinclude:: ../../finance/src/main/kotlin/com/r3corda/schemas/CashSchemaV1.kt
     :language: kotlin

docs/source/protocol-state-machines.rst

@@ -91,7 +91,7 @@ Our protocol has two parties (B and S for buyer and seller) and will proceed as
    it lacks a signature from S authorising movement of the asset.
 3. S signs it and hands the now finalised ``SignedTransaction`` back to B.
 
-You can find the implementation of this protocol in the file ``contracts/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt``.
+You can find the implementation of this protocol in the file ``finance/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt``.
 
 Assuming no malicious termination, they both end the protocol being in posession of a valid, signed transaction that
 represents an atomic asset swap.

docs/source/where-to-start.rst

@@ -36,7 +36,7 @@ The process of implementing a scenario looks like this:
 
 1. First of all, design your states and transaction types. Read about the :doc:`data-model` if you aren't sure what that
    involves.
-2. Now, create a new file in the contracts/src/main directory. You can either any JVM language but we only provide examples
+2. Now, create a new file in the finance/src/main directory. You can either any JVM language but we only provide examples
    in Java and Kotlin. The file should define your state classes and your contract class, which will define the
    allowable state transitions. You can learn how these are constructed by reading the ":doc:`tutorial-contract`" tutorial.
 3. It isn't enough to just define static data and logic that controls what's allowed. You must also orchestrate the

experimental/build.gradle

@@ -26,7 +26,7 @@ compileTestKotlin {
 
 dependencies {
     compile project(':core')
-    compile project(':contracts')
+    compile project(':finance')
 
     testCompile 'junit:junit:4.12'
     compile project(':test-utils')

finance/build.gradle

@@ -31,9 +31,9 @@ sourceSets {
 
 publishing {
     publications {
-        contracts(MavenPublication) {
+        finance(MavenPublication) {
             from components.java
-            artifactId 'contracts'
+            artifactId 'finance'
 
             artifact sourceJar
             artifact javadocJar

node/build.gradle

@@ -43,7 +43,7 @@ sourceSets {
 // build/reports/project/dependencies/index.html for green highlighted parts of the tree.
 
 dependencies {
-    compile project(':contracts')
+    compile project(':finance')
     testCompile project(':test-utils')
 
     compile "com.google.code.findbugs:jsr305:3.0.1"
@@ -143,7 +143,7 @@ dependencies {
     testCompile "com.nhaarman:mockito-kotlin:0.6.1"
 }
 
-quasarScan.dependsOn('classes', ':core:classes', ':contracts:classes')
+quasarScan.dependsOn('classes', ':core:classes', ':finance:classes')
 
 task integrationTest(type: Test) {
     testClassesDir = sourceSets.integrationTest.output.classesDir

settings.gradle

@@ -1,6 +1,6 @@
 rootProject.name = 'r3prototyping'
-include 'contracts'
-include 'contracts:isolated'
+include 'finance'
+include 'finance:isolated'
 include 'core'
 include 'node'
 include 'client'

test-utils/build.gradle

@@ -22,7 +22,7 @@ configurations {
 }
 
 dependencies {
-    compile project(':contracts')
+    compile project(':finance')
     compile project(':core')
     compile project(':node')
 
@@ -49,7 +49,7 @@ dependencies {
     compile 'com.squareup.okhttp3:okhttp:3.3.1'
 }
 
-quasarScan.dependsOn('classes', ':core:classes', ':contracts:classes')
+quasarScan.dependsOn('classes', ':core:classes', ':finance:classes')
 
 publishing {
     publications {

tools/explorer/build.gradle

@@ -58,7 +58,7 @@ dependencies {
     compile project(':core')
     compile project(':client')
     compile project(':node')
-    compile project(':contracts')
+    compile project(':finance')
 
     // FontAwesomeFX: The "FontAwesome" icon library.
     compile 'de.jensd:fontawesomefx-fontawesome:4.6.1-2'