ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-17 22:58:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-2331 Split Workflow and contracts of Finance App into separate Cordapps (#4422)

Browse Source 
* Split Workflow and contracts of Finance App into separate Cordapps, part 1 - content which is different between OS and ENT is still in contract Cordapp.

* Move CashSelection implementations to workflow module.

* Move CashSelection implmentations to workflow module.

* Move finance module to finance-flows, top level finance module is empty.

* Move finance module to finance-flows, top level finance module is empty.

* Updated build comment.

* Revert publication of combined (contracts and flows) corda-finance.jar (to maintain backwards compatibility with 3rd party cordapps dependent on finance)

* Added backwards compatibility clarification comment.

* Re-instate new cordapp metadata.

* Global rename of `finance-flows` to `finance-workflows` to follow adopted naming conventions.

* Addressed final review comments.

* Rename application to "Corda Finance Demo"

* Generation of original corda-finance jar from new sub-modules.

* Fixed and tested demobench with new split finance contract and workflow jars.

* Renamed finance sub-modules to contracts and workflows.

* Remove Michele!!!

* Minor fix to filtering logic.

* Align CorDapp configuration filename with workflows jar.

* Fix breaks caused by finance module naming changes.

* Final alignment between OS/ENT of finance contract code.
This commit is contained in:
szymonsztuka
2018-12-19 18:02:51 +00:00
committed by josecoll
parent a4037b374d
commit 4aaefb4fe9
92 changed files with 299 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
samples/trader-demo/build.gradle
View File

@ -23,7 +23,8 @@ dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
// The trader demo CorDapp depends upon Cash CorDapp features
cordapp project(':finance')
cordapp project(':finance:contracts')
cordapp project(':finance:workflows')
// Corda integration dependencies
cordaRuntime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
@ -54,12 +55,12 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask,
adminAddress "localhost:10004"
}
extraConfig = ['h2Settings.address' : 'localhost:10014']
cordapps = ["$project.group:finance:$corda_release_version"]
cordapps = ["$project.group:workflows:$corda_release_version", "$project.group:contracts:$corda_release_version"]
}
node {
name "O=Bank A,L=London,C=GB"
p2pPort 10005
cordapps = ["$project.group:finance:$corda_release_version"]
cordapps = ["$project.group:workflows:$corda_release_version", "$project.group:contracts:$corda_release_version"]
rpcUsers = ext.rpcUsers
rpcSettings {
address "localhost:10006"
@ -70,7 +71,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask,
node {
name "O=Bank B,L=New York,C=US"
p2pPort 10008
cordapps = ["$project.group:finance:$corda_release_version"]
cordapps = ["$project.group:workflows:$corda_release_version", "$project.group:contracts:$corda_release_version"]
rpcUsers = ext.rpcUsers
rpcSettings {
address "localhost:10009"
@ -81,7 +82,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask,
node {
name "O=BankOfCorda,L=New York,C=US"
p2pPort 10011
cordapps = ["$project.group:finance:$corda_release_version"]
cordapps = ["$project.group:workflows:$corda_release_version", "$project.group:contracts:$corda_release_version"]
rpcUsers = ext.rpcUsers
rpcSettings {
address "localhost:10012"
@ -94,7 +95,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask,
node {
name "O=LoggingBank,L=London,C=GB"
p2pPort 10025
cordapps = ["$project.group:finance:$corda_release_version"]
cordapps = ["$project.group:workflows:$corda_release_version", "$project.group:contracts:$corda_release_version"]
rpcUsers = ext.rpcUsers
rpcSettings {
address "localhost:10026"