ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-24 04:56:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
13,680 Commits 103 Branches 407 Tags
Commit Graph

13680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Viktor Kolomeyko
482277bad1
ENT-2689: Change SSL config structure (#1551) 
* ENT-2689: Intent of the changes to be made (doesn't compile)

* ENT-2689: Propagate renaming of `customSSLConfiguration`

* ENT-2689: Documentation update

* ENT-2689: More renaming

* ENT-2689: Add a test for SSL keystores location override

* ENT-2689: Add V3 configuration compatibility unit tests (failing for now)

* ENT-2689: Add ability to read V3 configs.

* ENT-2689: Reflect changes on Integration tests.

* ENT-2689: For BridgeControlListener use Artemis SSL configuration if specified, otherwise fall back onto main SSL configuration.

* Revert: ENT-2689: For BridgeControlListener use Artemis SSL configuration if specified, otherwise fall back onto main SSL configuration.

And rename `p2pSslOptions` to `publicSSLConfiguration`.

* ENT-2689: Move V3 config structures into a separate file.
 2018-11-13 16:34:41 +00:00
Michele Sollecito
aa0ccecfde
[CORDA-2172]: Add link to error-codes-webapp in Corda. (#4224) 2018-11-13 15:46:21 +00:00
Joel Dudley
f3b09988a9
Updates tutorial to reflect new template structure. Clean-up. (#4216) 
* Initial improvements.

* Updates tutorials.

* Missing imports.

* Addresses review feedback.
 2018-11-13 11:50:24 +00:00
Michele Sollecito
e2a351cb70
[CORDA-2123]: Unhandled IndexOutOfBoundsException for malformed Shell commands. (fix) (#4225) 2018-11-13 10:44:04 +00:00
Tommy Lillehagen
b456ed4ddd
ENT-2661 - Support material collection app (#1559) 
* ENT-2661 - Support material collection app

* ENT-2661 - Do not escape JSON strings, better Windows output
 2018-11-13 10:22:19 +00:00
Matthew Nesbit
44c8024c10
Merge pull request #1563 from corda/mnesbit-ensure-bridge-messages-acknowledged 
CORDA-2206: Some code paths for bridge control are not being acknowledged
 2018-11-13 10:20:09 +00:00
Konstantinos Chalkias
71117ebdad
[CORDA-2212] Better error on empty Party name fuzzy matching (#4220) 
* typo - no matching
 2018-11-12 19:34:21 +00:00
Shams Asari
1c012f6403
Back porting clean up of FlowFrameworkTests.kt made in ENT (#4218) 2018-11-12 18:38:47 +00:00
Anthony Keenan
369f23e306
CORDA-1817: Fix issue with misleading capsule error messages (#4215) 
* Make caplet respect all acceptable combinations of cmd line parameters

* If cordapp dir fails to create, still run corda.jar and let it fail gracefully

* Don't parse additional options as the parameter for the previous one.

* Remove commented lines
 2018-11-12 17:22:22 +00:00
Joel Dudley
bb0ed9e98c
Update CONTRIBUTORS.md 2018-11-12 17:15:19 +00:00
Michele Sollecito
dc62b20c5d
[CORDA-1879]: Ensure Node dies on unrecoverable errors. (#4213) 2018-11-12 15:56:04 +00:00
Matthew Nesbit
2600376773 Acknowledge all artemis messages 2018-11-12 14:01:45 +00:00
Michele Sollecito
ac23fcdf24
[CORDA-2208]: NodeHandles hashcode attemps an RPC invocation. (#4217) 2018-11-12 13:50:10 +00:00
Michele Sollecito
2f833f589c
Fixed missing entries for common modules in parent build.gradle file. (#4214) 
* Fixed missing entries for common modules in parent `build.gradle` file.

* Fixed publication names to match existing convention.
 2018-11-12 13:38:35 +00:00
Shams Asari
fab0c5cd2c
Merge pull request #1561 from corda/os-merge-99e9864 
O/S merge 99e9864
 2018-11-12 12:37:31 +00:00
Matthew Nesbit
9b38a0b9d0
Merge pull request #1560 from corda/mnesbit-fix-bad-merge 
Fixes a compile error due to a parallel change on master
 2018-11-12 12:21:10 +00:00
Konstantinos Chalkias
23907c40d9
[CORDA-2210] Add matching party on the first X500 attribute match (#4211) 2018-11-12 11:59:04 +00:00
Shams Asari
2e9d7ce811 CORDA-2129: Ported changes in SingleThreadedStateMachineManager to MultiThreadedStateMachineManager 
Introduced a new FlowFrameworkTestsUsingMultithreadedSMM test class to test the changes. In the process extracted out the multiple test classes in FlowFrameworkTests.kt.
 2018-11-12 10:44:40 +00:00
Matthew Nesbit
4ca03abaac Fix bad merge 2018-11-12 10:35:40 +00:00
Matthew Nesbit
d54e63e356
Merge pull request #1554 from corda/mnesbit-bully-leader 
ENT-2705: A Bully Algorithm Leader Elector for the Bridge
 2018-11-12 09:41:50 +00:00
Konstantinos Chalkias
81418ca7e7
[CORDA-2200][CORDA-2202] More tests for BCCryptoService and CryptoServiceException (#4190) 2018-11-12 09:38:06 +00:00
Matthew Nesbit
2caa082746
Some code paths for bridge control are now being acknowledged (#4206) 2018-11-09 17:54:51 +00:00
Roger Willis
4684259970
Expose JPA to flows (#4140) 
* First pass
* Update test.
* Address review comments.
* Added docs and kdocs.
* Clean-up.
* Add extra test.
* Changes to docsite.
* Added try/catch block as recommended by Andras.
* Removed try catch block. It's not required as the checkpoint serialiser deals with this.
* Re-used existing DB session instead of creating a new session.
* Entity manager auto flushes.
* Added java friendly api.
* Addressed review comments.
 2018-11-09 17:47:36 +00:00
Christian Sailer
65b8cbe9b1 Move cmd file to more suitable place 2018-11-09 17:55:15 +01:00
bpaunescu
7fbe8e7de7
renamed external artemis config properties for consistency (#1555) 2018-11-09 16:47:12 +00:00
Christian Sailer
30d90c50d1 Add cmd file to kill corda jobs on windows 2018-11-09 17:34:11 +01:00
Michal Kit
32ff24ddc7
ENT-2706 Fixing the CRL issuer cert lookup (#1556) 
* ENT-2706 Fixing the CRL issuer cert lookup

* Addressing review comments

* Reverting imports
 2018-11-09 16:20:00 +00:00
Roger Willis
2893271ab4 removed dupe companion object. (#4207) 2018-11-09 15:34:10 +00:00
Shams Asari
4801942a87 Merge branch 'merge-99e9864' into os-merge-99e9864 
# Conflicts:
#	.gitignore
#	.idea/codeStyles/Project.xml
 2018-11-09 14:53:26 +00:00
Shams Asari
8442b13e5e Un-ignoring .idea/codeStyles/ to make merge possible 2018-11-09 14:48:08 +00:00
Andrius Dagys
336185de23
CORDA-2190: Improve notary service flow exception handling (#4200) 
* CORDA-2190: Improve notary service flow exception handling

- Refactored notary flows to reduce validation code duplication
- Improved notarisation error handling to provide more helpful responses to the client
 2018-11-09 14:00:40 +00:00
Michal Kit
2f644039b5
CORDA-2205 Fixing CRL issuer store lookup (#4205) 2018-11-09 13:45:23 +00:00
Konstantinos Chalkias
4c25250fc8
[CORDA-2130] Encumbered states should always be assigned to the same notary (#4158) 2018-11-09 12:45:43 +00:00
josecoll
74c80aafd6
CORDA-2178 Signature constraints minimum platform version checking (#4161) 
* Minimum platform version checking for new signature constraints feature.

* Fix broken JUnit

* NP safety checking on network parameters.

* Warning and auto-downgrade of signed states that do not meet the minimum network platform version.
 2018-11-09 12:27:28 +00:00
Michele Sollecito
72be3aa830
Merge pull request #1553 from corda/merges/08_11_2018_16_05 
Merges: 08/11/2018 at 16:05
 2018-11-09 10:50:39 +00:00
Stefano Franz
99e9864975
add kotlin 1.3 codestyle to git (#4204) 2018-11-09 09:38:41 +00:00
Matthew Nesbit
51e9ef0cc0 Initial stage of Bully Algorithm Leader election 
Some artemis reconnect logic

Fix disconnect behaviour of BullyLeader code and improve Artemis shutdown behaviour when disconnected.

Integrate Bully Algorithm leader elector with the bridge

Fix docs

Remove pointless header change
 2018-11-09 09:34:44 +00:00
Matthew Nesbit
8ecf4385dc
Merge pull request #1552 from corda/mnesbit-artemis-close-when-disconnected 
ENT-2704: Improve artemis client shutdown time when disconnected
 2018-11-09 09:20:58 +00:00
Anthony Keenan
8d794bd525
Update node.conf samples (#4189) 2018-11-09 08:04:38 +00:00
Michele Sollecito
420b2ccd40 Merge branch 'master' into merges/08_11_2018_16_05 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/config/EnterpriseConfiguration.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
 2018-11-08 18:20:02 +00:00
Tommy Lillehagen
7c4eaf2f01
NOTICK - Allow JIRA user name to be provided in an environment variable (#4202) 2018-11-08 18:19:10 +00:00
Michele Sollecito
6a90f42eba Added enterprise specific fields to V1NodeConfigurationSpec. 2018-11-08 18:00:47 +00:00
Michele Sollecito
b6b37ad6f4 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:54:09 +00:00
Michele Sollecito
545dd25ef3 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:25:41 +00:00
Michele Sollecito
69921669e7 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:18:44 +00:00
Michele Sollecito
92ab3ab025 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:17:26 +00:00
Matthew Nesbit
0b134eee86 Improve artemis client shutdown time when disconnected and don't block on commit if Artemis is already closing. 2018-11-08 17:04:13 +00:00
Shams Asari
d4474e87e1
CORDA-2129: Attempts to initiate a flow that's unknown is paused and instead sent to the flow hospital (#4181) 
This allows for the case of a missing CorDapp to be installed on node restart and recover the original flow initiate request.
 2018-11-08 17:03:17 +00:00
Michele Sollecito
1671f7da31 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:00:03 +00:00
Michele Sollecito
fe581f8cf1 Working on merging changes to NodeConfigurationImpl. 2018-11-08 16:52:30 +00:00