ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-19 18:45:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
13,661 Commits 99 Branches 407 Tags
Commit Graph

13661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michele Sollecito
bd336ed4a7 Fixed compilation for NodeConfigurationImplTest 2018-11-08 16:48:11 +00:00
Michele Sollecito
11c7c879eb Merge remote-tracking branch 'remotes/open/master' into merges/08_11_2018_16_05 
# Conflicts:
#	docs/source/corda-configuration-file.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
 2018-11-08 16:39:09 +00:00
bpaunescu
41f5c530b2
ENT-2577 Custom SSL props for external Artemis connections (#1549) 
* ENT-2577 added additional node config for external artemis ssl config

* ENT-2577 update tests for external p2p broker

* ENT-2577 rename new config
 2018-11-08 16:31:02 +00:00
Michele Sollecito
6c749889d0
[CORDA-1993]: Replace reflection-based NodeConfiguration parsing with versioned property-based parsing mechanism. (#4132) 2018-11-08 15:56:00 +00:00
Rick Parker
9277042db8
ENT-2695 Restore async logging (#4195) 
* Replace error code generation technique with custom event re-writer.
Switch to RandomAccessFile appenders because they supposedly give higher throughput.

* Review feedback
 2018-11-08 14:33:45 +00:00
Viktor Kolomeyko
7a62e65ec7
ENT-2681: Re-throw original exception when parsing using old format failed. (#1550) 
* ENT-2681: Add explicit warning in the log explaining why parsing according to new configuration format has failed.
(Before trying ot use old config format)

* ENT-2681: Correctly report original error when parsing using old config format failed.
 2018-11-08 13:26:07 +00:00
szymonsztuka
bac265d418
Merge pull request #1548 from corda/merges/os-merge-to-ecbf23a 
Merge OS ->ENT to ecbf23a.
 2018-11-08 12:02:31 +00:00
Joel Dudley
99f6cc9e65
Updates tutorial to match template changes. (#4201) 2018-11-08 11:30:04 +00:00
szymonsztuka
611ca53cf7
Added missing ALIAS_PRIVATE_KEY static field to API Stability check. (#4194) 2018-11-08 10:21:45 +00:00
Joel Dudley
9c508673cf
Updates tutorial to match template changes. (#4170) 
* Updates tutorial to match template changes.

* Updates hello, world tutorials to match new template structures.
 2018-11-08 10:19:03 +00:00
Viktor Kolomeyko
400346fff0
ENT-2669: Introduce option for HTTP proxy for outbound Bridge connectivity (#1537) 
* ENT-2669: Introduce option for HTTP proxy for outbound Bridge connectivity

One of our customers currently using HTTP proxy without which outbound connection from Corda Node cannot be established.
Also, propagate `trace` setting correctly down the Bridge stack.

* ENT-2669: Compilation fixes.

* ENT-2669: Revert deleted constructor back.

* ENT-2669: First stub on HTTP Proxy integration test.

* ENT-2669: Minor changes.

* ENT-2669: Reduce test to bare minimum.

* ENT-2669: Attempt to write own HttpProxy.

* ENT-2669: Another attempt to make programmatic HttpProxy work.

* ENT-2697: Disable DNS resolution before sending requests to proxies.

* ENT-2669: Switch to use Jetty HttpProxy for integration testing.

* Adds a pipeline logger ahead of the proxy stage if trace is set. The logging is removed once the proxy completes.

Define a constant for pipeline stage.
 2018-11-08 09:04:36 +00:00
szymonsztuka
c0dd26cecc Typo mistakenly committed. 2018-11-07 21:18:05 +00:00
szymonsztuka
c3fa8951af Missing static field in api-current.txt - move at alphabetical position. 2018-11-07 19:12:37 +00:00
szymonsztuka
f6086a50aa Missing static field in api-current.txt. 2018-11-07 19:04:14 +00:00
szymonsztuka
44dfa23ad5 Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-to-ecbf23a 2018-11-07 18:17:29 +00:00
Stefano Franz
90597e1736
really disable building installer dist on OS X (#1547) 2018-11-07 18:16:51 +00:00
Stefano Franz
ecbf23ab73
CORDA-2106: Print node info gen log on bootstrap failure (#4184) 
* print node-gen log when nodeInfo generation fails during bootstrapping

* add logic to print out the legal name of the node which failed to generate nodeInfo
 2018-11-07 19:05:50 +01:00
szymonsztuka
e956c0f5fe
Docs - link from the page about signing Cordapp to the page about node configuration regarding enabling Cordapp signed by dev key to be run in production mode (related to CORDA-1915). (#4172) 2018-11-07 16:48:31 +00:00
Christian Sailer
df954d36d2
Make the shell test pass when it happens to find the Integer constructor (#4187) 2018-11-07 16:37:42 +00:00