11572 Commits

Author SHA1 Message Date
bpaunescu
3a17d4726f ENT-1775: reworked client to handle failover in HA mode instead of relying on artemis ()
* ENT-1775: reworked client to handle failover in HA mode instead of relying on artemis

* ENT-1775: address PR comments
2018-04-22 14:48:16 +01:00
Patrick Kuo
e618b49a6c
fix a bug which prevent us from starting network map server without doorman. () 2018-04-20 17:45:27 +01:00
Anthony Keenan
247a97f1a5
Remove superfluous registerInitiatedFlow calls from tutorial and example tests () 2018-04-20 16:56:27 +01:00
Chris Rankin
342ecc4eed
CORDA-1265: Upgrade to Kotlin language/API 1.2 ()
* Upgrade to Kotlin language/API 1.2
* Kotlin 1.2 annotates private Companion instances as "@Deprecated".
2018-04-20 15:03:07 +01:00
josecoll
1c7def8e12
Fix streaming subscription bug. () 2018-04-20 11:07:36 +01:00
bpaunescu
c0f254e3bb
ENT-1775: reworked client to handle failover in HA mode instead of relying on artemis ()
* ENT-1775: reworked client to handle failover in HA mode instead of relying on artemis

* ENT-1775: address PR comments
2018-04-20 10:52:00 +01:00
Matthew Nesbit
3931f13852
Merge pull request from corda/mnesbit-bridge-ha
Introduce a simple Zookeeper managed HA Leader election into the Bridge/Float
2018-04-20 08:59:58 +01:00
Patrick Kuo
57291c435c
ENT-1661 Doorman crashes ungracefully when started with incorrect or … ()
* ENT-1661 Doorman crashes ungracefully when started with incorrect or no program arguments. Should display a meaningful message instead.
2018-04-19 21:22:04 +01:00
Matthew Nesbit
942da1b8e0 First cut HA for bridge
Simple implementation of bridge HA logic. Fix of shading magic in gradle. Removal of exposed curator classes from node-api interface.

Simple implementation of bridge HA logic. Fix of shading magic in gradle. Removal of exposed curator classes from node-api interface.

Modify leader priority test to catch lexical rather than numeric sorting.
2018-04-19 16:00:11 +01:00
josecoll
ca55c80bfc
Move kotlin utility helper out of public into internals. () 2018-04-19 13:48:13 +01:00
josecoll
b3a4e3907f
OS -> ENT Merge ()
* Better cert path validation exception message for PartyAndCertificate.verify ()

* Corda Behave extensions for CTS ()

* Updated to Corda 3.0, added support for PostgreSQL, added STAGING_ROOT environment variable, incorporating Watch improvements (Maks), Steps Provider interface for auto-scanning of 3rd party steps providers, re-implemented StepBlocks, new ScenarioRunner executable tool, additional Steps definitions (Vault, issue/transfer cash, cordapps), other minor bug fixes and logging improvements.

* Updates incorporating PR review feedback.

* Reverted back to original - will re-test in ENT.

* Removed all SQL Server code (to be included in ENT only)

* Minor updates following second PR review.

* Fixed broken scenario tests.

* Final fix for PostgreSQL scenario test.
2018-04-19 11:49:17 +01:00
josecoll
ec70478d70
Corda Behave extensions for CTS ()
* Updated to Corda 3.0, added support for PostgreSQL, added STAGING_ROOT environment variable, incorporating Watch improvements (Maks), Steps Provider interface for auto-scanning of 3rd party steps providers, re-implemented StepBlocks, new ScenarioRunner executable tool, additional Steps definitions (Vault, issue/transfer cash, cordapps), other minor bug fixes and logging improvements.

* Updates incorporating PR review feedback.

* Reverted back to original - will re-test in ENT.

* Removed all SQL Server code (to be included in ENT only)

* Minor updates following second PR review.

* Fixed broken scenario tests.

* Final fix for PostgreSQL scenario test.
2018-04-19 09:56:16 +01:00
Shams Asari
a684507553
Better cert path validation exception message for PartyAndCertificate.verify () 2018-04-18 17:27:03 +01:00
Patrick Kuo
ac99b81ba8
added optional config property for keystore file path () 2018-04-18 17:10:04 +01:00
Patrick Kuo
9cbf7fd7ab
register crypto provider in main when program startsup () 2018-04-18 17:09:45 +01:00
Andrius Dagys
5373c6364f Design: HA Notary service () 2018-04-18 14:44:23 +01:00
Anthony Keenan
5f0d157432
Merge pull request from corda/anthony-os-merge-20180418
O/S Merge
2018-04-18 13:02:56 +01:00
Andrius Dagys
e09719fe67
Design: Kafka-based notary service ()
* Design: high performance Kafka-based CFT notary service.

* Add discussion why we don't consider RDBMSs for the committed state index.

* Add discussion on how we could utilise Kafka partitioning.
2018-04-18 11:44:53 +01:00
Anthony Keenan
39bb3912a5 Fix merge issue 2018-04-18 11:37:38 +01:00
Anthony Keenan
af77c5a287 Merge remote-tracking branch 'open/master' into anthony-os-merge-20180418
# Conflicts:
#	constants.properties
#	docs/source/changelog.rst
2018-04-18 11:24:22 +01:00
Michal Kit
38a38aa4c4
Fixing Azure deadlock when CSR is persisted () 2018-04-18 11:21:11 +01:00
Anthony Keenan
7db48de2b8
CORDA-1344 Fix query paging in scheduled flow tests ()
* Fix paging tests, move out of scheduled flow tests and provide java example

* Fix a few issues with docs
2018-04-18 11:10:21 +01:00
Shams Asari
60323cca15
CORDA-1312: Network bootstrapper copies any CorDapp jars into each nodes' cordapps dir () 2018-04-17 15:38:25 +01:00
cburlinchon
7789d5475f
Revert node suspend and resume () 2018-04-17 15:14:58 +01:00
Matthew Nesbit
0deed37569
Merge pull request from corda/mnesbit-shaded-zookeeper
Shade the zookeeper libraries to avoid version conflicts
2018-04-17 13:34:32 +01:00
Matthew Nesbit
1c169d035a Shade the zookeeper libraries to avoid version conflicts
Add comment to explain gradle logic
2018-04-17 12:07:09 +01:00
Patrick Kuo
0e663250ca
add old config annotation to doorman config () 2018-04-17 10:35:28 +01:00
Shams Asari
84ca67a5e3
Merge pull request from corda/os-merge-1288f63
O/S merge from 1288f63
2018-04-17 07:59:01 +01:00
Shams Asari
b6d43c0204 Merge remote-tracking branch 'open/master' into os-merge-1288f63
# Conflicts:
#	constants.properties
#	node/src/main/kotlin/net/corda/node/internal/cordapp/CordappConfigProvider.kt
#	samples/cordapp-configuration/src/main/kotlin/net/corda/configsample/ConfigSampleFlow.kt
2018-04-16 17:35:43 +01:00
Shams Asari
1288f63998
Fixed the CorDapp configuration demo () 2018-04-16 17:23:11 +01:00
josecoll
89aa2b57e5
Merged release notes, upgrade notes, and changelog from DP3 release branch to master. () 2018-04-16 16:05:08 +01:00
Tudor Malene
060fee84ab
Merge pull request from corda/merge/tudor_16_04_18 2018-04-16 15:02:12 +01:00
Patrick Kuo
fbdba41b07
ENT-1740 Make registration tool notary only to avoid confusion ()
* ENT-1740 Make registration tool notary only to avoid confusion

* address PR issues
2018-04-16 14:56:13 +01:00
Rick Parker
34f8719363
ENT-1766 Release soft locks inside the database transaction () 2018-04-16 13:51:50 +01:00
tudor.malene@gmail.com
47cc2f0bb1 Merge remote-tracking branch 'open/master' into merge/tudor_16_04_18 2018-04-16 13:32:01 +01:00
Tudor Malene
9d2b7f0b7b
CORDA-1313 RPC whitelist TransactionVerificationException () 2018-04-16 13:29:36 +01:00
Christian Sailer
408582cd05
OS -> R3 Corda up to CORDA-1336
OS -> R3 Corda up to d8bf1019b6c7ddbe709cff7c730e66eb576f9ad5
2018-04-13 18:09:30 +01:00
Tudor Malene
d34d599baf
fix url () 2018-04-13 16:58:19 +01:00
Christian Sailer
a0bf0261bb Merge commit 'd8bf1019b6c7ddbe709cff7c730e66eb576f9ad5' into christians/merge-CORDA-1336 2018-04-13 16:39:00 +01:00
Christian Sailer
d8bf1019b6
CORDA-1336: Turn off direct delivery in Artemis via config ()
* CORDA-1336: Turn off direct delivery in Artemis via config - this can
deadlock when the server gets busy and switches back and forth between
direct and async delivery if it can't keep up.

* CORDA-1336: put in a comment explaining the config setting.
2018-04-13 16:17:24 +01:00
Patrick Kuo
7f8c36faa0
ENT-1586 Update entire service stack to support private network maps ()
* private network map
2018-04-13 15:54:53 +01:00
szymonsztuka
05ec885afd
Update integration test setup in database mode after OS->ENT merge ()
Added Notary schema for SQL setup to tests.
Added SQL setup/tearDown to a loop starting the same node few times in DriverTests.
2018-04-13 15:28:07 +01:00
Katelyn Baker
f4ce31019e
Merge pull request from corda/kat-merge-180412
MERGE - 18 - 04 - 12
2018-04-13 14:39:15 +01:00
Konstantinos Chalkias
6f69f0252d
CORDA-1337 Crypto.registerProviders ()
CORDA-1337 Crypto.registerProviders + add BCPQC as well
2018-04-13 12:40:15 +01:00
Katelyn Baker
98b912e633 MERGE: OS Merge Fixes 2018-04-13 11:46:36 +01:00
Katarzyna Streich
91c52af5ac
ENT-1584: Subscribe to private network maps using UUIDs ()
Client private network map implementation

Add private network maps UUIDs to config as extraNetworkMapKeys. Adjust NetworkMapServer implementation accordingly.
Change NetworkMapUpdaterTest to use NetworkMapServer instead of mock
2018-04-13 10:52:45 +01:00
Katelyn Baker
03478142ef MERGE: OS Merge Fixes 2018-04-13 10:44:10 +01:00
Michal Kit
a320c8d49f
ENT-1456 Adding try-catch to jira ticket processing ()
* Adding try-catch to jira ticket processing

* Addressing review comments

* Addressing review comments

* Refactoring getTransitionId method.

* Addressing review comments

* Refactoring to use requireNotNull

* Refactoring to use more requireNotNull

* Fixing missing map population
2018-04-13 07:46:16 +01:00
Katelyn Baker
5bb9514582 Merge remote-tracking branch 'open/master' into kat-merge-180412 2018-04-12 20:34:28 +01:00
Shams Asari
02913b284e
CORDA-1312: Removed the need to have whitelist.txt for updating the contracts whitelist using the bootstrapper. ()
Instead the current whitelist is read in from the existing network parameters file.
2018-04-12 17:03:06 +01:00