Commit Graph

11528 Commits

Author SHA1 Message Date
Rick Parker
51df3872b2
ENT-1791 Stop performance tests returning whole transactions (#752) 2018-04-23 16:55:55 +01:00
Viktor Kolomeyko
f64226364b
Merge pull request #766 from corda/feature/vkolomeyko/corda-os-merge
OS->Ent merge
2018-04-23 15:45:30 +01:00
Viktor Kolomeyko
071be31916 Resolve merge conflicts 2018-04-23 14:27:32 +01:00
Viktor Kolomeyko
f1fd1cefd8 Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/corda-os-merge 2018-04-23 14:19:51 +01:00
Viktor Kolomeyko
3aaa176dd4
CORDA-1355: Introduce a dedicated property which controls what is going to be in scope for classpath scanning (#2977)
* CORDA-1355: Introduce a dedicated property which controls what is going to be in scope for classpath scanning

* CORDA-1355: Update change log

* CORDA-1355: Minor change to improve readability.

* CORDA-1355: Custom serializers documentation update to mention new system property.
2018-04-23 13:55:40 +01:00
josecoll
5ae35b70dc
Merge pull request #764 from corda/colljos-merge-230418
OS -> ENT merge
2018-04-23 13:26:15 +01:00
josecoll
15c015e0d6 Merge branch 'master' into colljos-merge-230418 2018-04-23 12:12:16 +01:00
Viktor Kolomeyko
bf4d8ba08c
CORDA-1335: Scan attachment Jar only to speed-up the process. (#2982)
* CORDA-1335: Scan attachment Jar only to speed-up the process.

* CORDA-1335: Explicitly mention other types of contracts to scan.

* CORDA-1335: Refactor to eliminate listing different subclasses of Contract in two separate places.
2018-04-23 09:17:43 +01:00
Patrick Kuo
e618b49a6c
fix a bug which prevent us from starting network map server without doorman. (#760) 2018-04-20 17:45:27 +01:00
Anthony Keenan
247a97f1a5
Remove superfluous registerInitiatedFlow calls from tutorial and example tests (#2944) 2018-04-20 16:56:27 +01:00
Chris Rankin
342ecc4eed
CORDA-1265: Upgrade to Kotlin language/API 1.2 (#2871)
* 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. (#2983) 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 (#759)
* 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 #755 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 … (#747)
* 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. (#2979) 2018-04-19 13:48:13 +01:00
josecoll
b3a4e3907f
OS -> ENT Merge (#757)
* Better cert path validation exception message for PartyAndCertificate.verify (#2976)

* Corda Behave extensions for CTS (#2968)

* 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 (#2968)
* 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 (#2976) 2018-04-18 17:27:03 +01:00
Patrick Kuo
ac99b81ba8
added optional config property for keystore file path (#748) 2018-04-18 17:10:04 +01:00
Patrick Kuo
9cbf7fd7ab
register crypto provider in main when program startsup (#745) 2018-04-18 17:09:45 +01:00
Andrius Dagys
5373c6364f Design: HA Notary service (#368) 2018-04-18 14:44:23 +01:00
Anthony Keenan
5f0d157432
Merge pull request #750 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 (#700)
* 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 (#749) 2018-04-18 11:21:11 +01:00
Anthony Keenan
7db48de2b8
CORDA-1344 Fix query paging in scheduled flow tests (#2970)
* 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 (#2974) 2018-04-17 15:38:25 +01:00
cburlinchon
7789d5475f
Revert node suspend and resume (#744) 2018-04-17 15:14:58 +01:00
Matthew Nesbit
0deed37569
Merge pull request #742 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 (#731) 2018-04-17 10:35:28 +01:00
Shams Asari
84ca67a5e3
Merge pull request #743 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 (#2967) 2018-04-16 17:23:11 +01:00
josecoll
89aa2b57e5
Merged release notes, upgrade notes, and changelog from DP3 release branch to master. (#740) 2018-04-16 16:05:08 +01:00
Tudor Malene
060fee84ab
Merge pull request #739 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 (#734)
* 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 (#737) 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 (#2965) 2018-04-16 13:29:36 +01:00
Christian Sailer
408582cd05
OS -> R3 Corda up to CORDA-1336
OS -> R3 Corda up to d8bf1019b6
2018-04-13 18:09:30 +01:00
Tudor Malene
d34d599baf
fix url (#735) 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 (#2961)
* 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 (#691)
* private network map
2018-04-13 15:54:53 +01:00
szymonsztuka
05ec885afd
Update integration test setup in database mode after OS->ENT merge (#732)
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 #733 from corda/kat-merge-180412
MERGE - 18 - 04 - 12
2018-04-13 14:39:15 +01:00