From 7e198e7cf3a80582aa16edead0784f00be4dff91 Mon Sep 17 00:00:00 2001 From: Clinton Alexander Date: Fri, 4 Nov 2016 10:28:42 +0000 Subject: [PATCH] Renamed contracts project to finance to better reflect the purpose of the project. --- .idea/modules.xml | 2 +- docs/source/creating-a-cordapp.rst | 4 ++-- docs/source/persistence.rst | 2 +- docs/source/protocol-state-machines.rst | 2 +- docs/source/where-to-start.rst | 2 +- experimental/build.gradle | 2 +- {contracts => finance}/build.gradle | 4 ++-- {contracts => finance}/isolated/build.gradle | 0 .../main/kotlin/com/r3corda/contracts/AnotherDummyContract.kt | 0 .../kotlin/com/r3corda/core/node/DummyContractBackdoor.kt | 0 .../java/com/r3corda/contracts/ICommercialPaperState.java | 0 .../main/java/com/r3corda/contracts/JavaCommercialPaper.java | 0 .../src/main/kotlin/com/r3corda/contracts/CommercialPaper.kt | 0 .../kotlin/com/r3corda/contracts/CommercialPaperLegacy.kt | 0 .../src/main/kotlin/com/r3corda/contracts/asset/Cash.kt | 0 .../kotlin/com/r3corda/contracts/asset/CommodityContract.kt | 0 .../src/main/kotlin/com/r3corda/contracts/asset/Obligation.kt | 0 .../main/kotlin/com/r3corda/contracts/asset/OnLedgerAsset.kt | 0 .../com/r3corda/contracts/clause/AbstractConserveAmount.kt | 0 .../main/kotlin/com/r3corda/contracts/clause/AbstractIssue.kt | 0 .../src/main/kotlin/com/r3corda/contracts/clause/Net.kt | 0 .../kotlin/com/r3corda/contracts/clause/NoZeroSizedOutputs.kt | 0 .../main/kotlin/com/r3corda/contracts/testing/Generators.kt | 0 .../main/kotlin/com/r3corda/contracts/testing/VaultFiller.kt | 0 .../kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt | 0 .../src/main/kotlin/com/r3corda/schemas/CashSchemaV1.kt | 0 .../kotlin/com/r3corda/schemas/CommercialPaperSchemaV1.kt | 0 .../test/java/com/r3corda/contracts/asset/CashTestsJava.java | 0 .../test/kotlin/com/r3corda/contracts/CommercialPaperTests.kt | 0 .../src/test/kotlin/com/r3corda/contracts/asset/CashTests.kt | 0 .../kotlin/com/r3corda/contracts/asset/ObligationTests.kt | 0 node/build.gradle | 2 +- settings.gradle | 4 ++-- test-utils/build.gradle | 2 +- tools/explorer/build.gradle | 2 +- 35 files changed, 14 insertions(+), 14 deletions(-) rename {contracts => finance}/build.gradle (90%) rename {contracts => finance}/isolated/build.gradle (100%) rename {contracts => finance}/isolated/src/main/kotlin/com/r3corda/contracts/AnotherDummyContract.kt (100%) rename {contracts => finance}/isolated/src/main/kotlin/com/r3corda/core/node/DummyContractBackdoor.kt (100%) rename {contracts => finance}/src/main/java/com/r3corda/contracts/ICommercialPaperState.java (100%) rename {contracts => finance}/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java (100%) rename {contracts => finance}/src/main/kotlin/com/r3corda/contracts/CommercialPaper.kt (100%) rename {contracts => finance}/src/main/kotlin/com/r3corda/contracts/CommercialPaperLegacy.kt (100%) rename {contracts => finance}/src/main/kotlin/com/r3corda/contracts/asset/Cash.kt (100%) rename {contracts => finance}/src/main/kotlin/com/r3corda/contracts/asset/CommodityContract.kt (100%) rename {contracts => finance}/src/main/kotlin/com/r3corda/contracts/asset/Obligation.kt (100%) rename {contracts => finance}/src/main/kotlin/com/r3corda/contracts/asset/OnLedgerAsset.kt (100%) rename {contracts => finance}/src/main/kotlin/com/r3corda/contracts/clause/AbstractConserveAmount.kt (100%) rename {contracts => finance}/src/main/kotlin/com/r3corda/contracts/clause/AbstractIssue.kt (100%) rename {contracts => finance}/src/main/kotlin/com/r3corda/contracts/clause/Net.kt (100%) rename {contracts => finance}/src/main/kotlin/com/r3corda/contracts/clause/NoZeroSizedOutputs.kt (100%) rename {contracts => finance}/src/main/kotlin/com/r3corda/contracts/testing/Generators.kt (100%) rename {contracts => finance}/src/main/kotlin/com/r3corda/contracts/testing/VaultFiller.kt (100%) rename {contracts => finance}/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt (100%) rename {contracts => finance}/src/main/kotlin/com/r3corda/schemas/CashSchemaV1.kt (100%) rename {contracts => finance}/src/main/kotlin/com/r3corda/schemas/CommercialPaperSchemaV1.kt (100%) rename {contracts => finance}/src/test/java/com/r3corda/contracts/asset/CashTestsJava.java (100%) rename {contracts => finance}/src/test/kotlin/com/r3corda/contracts/CommercialPaperTests.kt (100%) rename {contracts => finance}/src/test/kotlin/com/r3corda/contracts/asset/CashTests.kt (100%) rename {contracts => finance}/src/test/kotlin/com/r3corda/contracts/asset/ObligationTests.kt (100%) diff --git a/.idea/modules.xml b/.idea/modules.xml index 0114516271..360fe0be0c 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -61,4 +61,4 @@ - \ No newline at end of file + diff --git a/docs/source/creating-a-cordapp.rst b/docs/source/creating-a-cordapp.rst index 5c57d026c3..c208cd90f2 100644 --- a/docs/source/creating-a-cordapp.rst +++ b/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 ... diff --git a/docs/source/persistence.rst b/docs/source/persistence.rst index ab8163b465..755734da25 100644 --- a/docs/source/persistence.rst +++ b/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 \ No newline at end of file diff --git a/docs/source/protocol-state-machines.rst b/docs/source/protocol-state-machines.rst index 16ed30c951..f37031275a 100644 --- a/docs/source/protocol-state-machines.rst +++ b/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. diff --git a/docs/source/where-to-start.rst b/docs/source/where-to-start.rst index cee3301888..3b8b241b6a 100644 --- a/docs/source/where-to-start.rst +++ b/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 diff --git a/experimental/build.gradle b/experimental/build.gradle index fa5287a577..ebbbabaebf 100644 --- a/experimental/build.gradle +++ b/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') diff --git a/contracts/build.gradle b/finance/build.gradle similarity index 90% rename from contracts/build.gradle rename to finance/build.gradle index 2d585d8d04..116d060067 100644 --- a/contracts/build.gradle +++ b/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 diff --git a/contracts/isolated/build.gradle b/finance/isolated/build.gradle similarity index 100% rename from contracts/isolated/build.gradle rename to finance/isolated/build.gradle diff --git a/contracts/isolated/src/main/kotlin/com/r3corda/contracts/AnotherDummyContract.kt b/finance/isolated/src/main/kotlin/com/r3corda/contracts/AnotherDummyContract.kt similarity index 100% rename from contracts/isolated/src/main/kotlin/com/r3corda/contracts/AnotherDummyContract.kt rename to finance/isolated/src/main/kotlin/com/r3corda/contracts/AnotherDummyContract.kt diff --git a/contracts/isolated/src/main/kotlin/com/r3corda/core/node/DummyContractBackdoor.kt b/finance/isolated/src/main/kotlin/com/r3corda/core/node/DummyContractBackdoor.kt similarity index 100% rename from contracts/isolated/src/main/kotlin/com/r3corda/core/node/DummyContractBackdoor.kt rename to finance/isolated/src/main/kotlin/com/r3corda/core/node/DummyContractBackdoor.kt diff --git a/contracts/src/main/java/com/r3corda/contracts/ICommercialPaperState.java b/finance/src/main/java/com/r3corda/contracts/ICommercialPaperState.java similarity index 100% rename from contracts/src/main/java/com/r3corda/contracts/ICommercialPaperState.java rename to finance/src/main/java/com/r3corda/contracts/ICommercialPaperState.java diff --git a/contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java b/finance/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java similarity index 100% rename from contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java rename to finance/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/CommercialPaper.kt b/finance/src/main/kotlin/com/r3corda/contracts/CommercialPaper.kt similarity index 100% rename from contracts/src/main/kotlin/com/r3corda/contracts/CommercialPaper.kt rename to finance/src/main/kotlin/com/r3corda/contracts/CommercialPaper.kt diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/CommercialPaperLegacy.kt b/finance/src/main/kotlin/com/r3corda/contracts/CommercialPaperLegacy.kt similarity index 100% rename from contracts/src/main/kotlin/com/r3corda/contracts/CommercialPaperLegacy.kt rename to finance/src/main/kotlin/com/r3corda/contracts/CommercialPaperLegacy.kt diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/asset/Cash.kt b/finance/src/main/kotlin/com/r3corda/contracts/asset/Cash.kt similarity index 100% rename from contracts/src/main/kotlin/com/r3corda/contracts/asset/Cash.kt rename to finance/src/main/kotlin/com/r3corda/contracts/asset/Cash.kt diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/asset/CommodityContract.kt b/finance/src/main/kotlin/com/r3corda/contracts/asset/CommodityContract.kt similarity index 100% rename from contracts/src/main/kotlin/com/r3corda/contracts/asset/CommodityContract.kt rename to finance/src/main/kotlin/com/r3corda/contracts/asset/CommodityContract.kt diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/asset/Obligation.kt b/finance/src/main/kotlin/com/r3corda/contracts/asset/Obligation.kt similarity index 100% rename from contracts/src/main/kotlin/com/r3corda/contracts/asset/Obligation.kt rename to finance/src/main/kotlin/com/r3corda/contracts/asset/Obligation.kt diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/asset/OnLedgerAsset.kt b/finance/src/main/kotlin/com/r3corda/contracts/asset/OnLedgerAsset.kt similarity index 100% rename from contracts/src/main/kotlin/com/r3corda/contracts/asset/OnLedgerAsset.kt rename to finance/src/main/kotlin/com/r3corda/contracts/asset/OnLedgerAsset.kt diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/clause/AbstractConserveAmount.kt b/finance/src/main/kotlin/com/r3corda/contracts/clause/AbstractConserveAmount.kt similarity index 100% rename from contracts/src/main/kotlin/com/r3corda/contracts/clause/AbstractConserveAmount.kt rename to finance/src/main/kotlin/com/r3corda/contracts/clause/AbstractConserveAmount.kt diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/clause/AbstractIssue.kt b/finance/src/main/kotlin/com/r3corda/contracts/clause/AbstractIssue.kt similarity index 100% rename from contracts/src/main/kotlin/com/r3corda/contracts/clause/AbstractIssue.kt rename to finance/src/main/kotlin/com/r3corda/contracts/clause/AbstractIssue.kt diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/clause/Net.kt b/finance/src/main/kotlin/com/r3corda/contracts/clause/Net.kt similarity index 100% rename from contracts/src/main/kotlin/com/r3corda/contracts/clause/Net.kt rename to finance/src/main/kotlin/com/r3corda/contracts/clause/Net.kt diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/clause/NoZeroSizedOutputs.kt b/finance/src/main/kotlin/com/r3corda/contracts/clause/NoZeroSizedOutputs.kt similarity index 100% rename from contracts/src/main/kotlin/com/r3corda/contracts/clause/NoZeroSizedOutputs.kt rename to finance/src/main/kotlin/com/r3corda/contracts/clause/NoZeroSizedOutputs.kt diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/testing/Generators.kt b/finance/src/main/kotlin/com/r3corda/contracts/testing/Generators.kt similarity index 100% rename from contracts/src/main/kotlin/com/r3corda/contracts/testing/Generators.kt rename to finance/src/main/kotlin/com/r3corda/contracts/testing/Generators.kt diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/testing/VaultFiller.kt b/finance/src/main/kotlin/com/r3corda/contracts/testing/VaultFiller.kt similarity index 100% rename from contracts/src/main/kotlin/com/r3corda/contracts/testing/VaultFiller.kt rename to finance/src/main/kotlin/com/r3corda/contracts/testing/VaultFiller.kt diff --git a/contracts/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt b/finance/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt similarity index 100% rename from contracts/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt rename to finance/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt diff --git a/contracts/src/main/kotlin/com/r3corda/schemas/CashSchemaV1.kt b/finance/src/main/kotlin/com/r3corda/schemas/CashSchemaV1.kt similarity index 100% rename from contracts/src/main/kotlin/com/r3corda/schemas/CashSchemaV1.kt rename to finance/src/main/kotlin/com/r3corda/schemas/CashSchemaV1.kt diff --git a/contracts/src/main/kotlin/com/r3corda/schemas/CommercialPaperSchemaV1.kt b/finance/src/main/kotlin/com/r3corda/schemas/CommercialPaperSchemaV1.kt similarity index 100% rename from contracts/src/main/kotlin/com/r3corda/schemas/CommercialPaperSchemaV1.kt rename to finance/src/main/kotlin/com/r3corda/schemas/CommercialPaperSchemaV1.kt diff --git a/contracts/src/test/java/com/r3corda/contracts/asset/CashTestsJava.java b/finance/src/test/java/com/r3corda/contracts/asset/CashTestsJava.java similarity index 100% rename from contracts/src/test/java/com/r3corda/contracts/asset/CashTestsJava.java rename to finance/src/test/java/com/r3corda/contracts/asset/CashTestsJava.java diff --git a/contracts/src/test/kotlin/com/r3corda/contracts/CommercialPaperTests.kt b/finance/src/test/kotlin/com/r3corda/contracts/CommercialPaperTests.kt similarity index 100% rename from contracts/src/test/kotlin/com/r3corda/contracts/CommercialPaperTests.kt rename to finance/src/test/kotlin/com/r3corda/contracts/CommercialPaperTests.kt diff --git a/contracts/src/test/kotlin/com/r3corda/contracts/asset/CashTests.kt b/finance/src/test/kotlin/com/r3corda/contracts/asset/CashTests.kt similarity index 100% rename from contracts/src/test/kotlin/com/r3corda/contracts/asset/CashTests.kt rename to finance/src/test/kotlin/com/r3corda/contracts/asset/CashTests.kt diff --git a/contracts/src/test/kotlin/com/r3corda/contracts/asset/ObligationTests.kt b/finance/src/test/kotlin/com/r3corda/contracts/asset/ObligationTests.kt similarity index 100% rename from contracts/src/test/kotlin/com/r3corda/contracts/asset/ObligationTests.kt rename to finance/src/test/kotlin/com/r3corda/contracts/asset/ObligationTests.kt diff --git a/node/build.gradle b/node/build.gradle index 1a0bf168b4..ff757dda58 100644 --- a/node/build.gradle +++ b/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" diff --git a/settings.gradle b/settings.gradle index a54d52c78b..863f7e76eb 100644 --- a/settings.gradle +++ b/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' diff --git a/test-utils/build.gradle b/test-utils/build.gradle index 3c063219f7..b365fac2c1 100644 --- a/test-utils/build.gradle +++ b/test-utils/build.gradle @@ -22,7 +22,7 @@ configurations { } dependencies { - compile project(':contracts') + compile project(':finance') compile project(':core') compile project(':node') diff --git a/tools/explorer/build.gradle b/tools/explorer/build.gradle index cb665a6407..9d4ff7c7a7 100644 --- a/tools/explorer/build.gradle +++ b/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'