11911 Commits

Author SHA1 Message Date
Katelyn Baker
8925ca8954 Fix GitHub's attempt at conflict resolution 2018-05-18 15:42:42 +01:00
Katelyn Baker
3778f029df
Merge branch 'master' into kat-merge-20180517 2018-05-18 14:42:05 +01:00
Stefano Franz
79f18abe60
Merge pull request #458 from corda/stories/ENT-1152/bootstrapper
Standalone packaging using two-stage loader (experimental) [ENT-1152]
2018-05-18 14:37:35 +01:00
Michal Kit
71aeb6c339
Improving revocation reason selection (#845)
* Improving revocation reason selection

* Addressing review comments - round 2
2018-05-18 14:29:57 +01:00
Katelyn Baker
8c9773fc13 Merge build fix - add AMQP to RPC Proxy Web 2018-05-18 14:27:38 +01:00
Patrick
f8070b0811 fix test 2018-05-18 12:02:00 +01:00
Michal Kit
da6957e6d1
Fixes for the CRL feature after the first round of testing (#837)
* Fixes for the CRL feature after the first round of testing

* Addressing review comments

* Synchronising changes with OS

* Addressing review comments - round 2
2018-05-18 11:17:43 +01:00
Katelyn Baker
4ed3d779b0 merge build fix 2018-05-18 11:16:45 +01:00
Katelyn Baker
71c2566cb5 API - Update current api baseline from open/master 2018-05-18 10:10:53 +01:00
Katelyn Baker
1cfc9c6e0c Post merge cleanup for Max Mem Size 2018-05-18 09:54:56 +01:00
Katelyn Baker
d91f063cbe Define Custom NetMan AMQP Scheme
Removes dependency on node and AMQPServerSerializationscheme
2018-05-17 21:19:05 +01:00
Andrius Dagys
1c575b5364
Tool for prototyping and load testing notary implementations (#823) 2018-05-17 20:02:19 +01:00
Katelyn Baker
819200ee3e Create bridge serialization scheme to remove newly added dep on node 2018-05-17 17:17:22 +01:00
Katelyn Baker
4a05828e20 OS Merge cleanup 2018-05-17 16:50:17 +01:00
Stefano Franz
07d89c79be add dependency on node jar task to get corda-node on classpath
fix example-node.conf for current master
2018-05-17 16:35:46 +01:00
igor nitto
7d71233a35 Rebased on master (tested manually against simm-valuation-demo) 2018-05-17 16:35:46 +01:00
IgorNitto
5ea82039d7 Some initial PR comments 2018-05-17 16:35:06 +01:00
IgorNitto
d85b17c042 fixes 2018-05-17 16:35:06 +01:00
IgorNitto
18cc1bbb0c Some Gradle refactoring 2018-05-17 16:35:06 +01:00
IgorNitto
bc3facaed9 Two-stage initialization approach for packaging 2018-05-17 16:34:24 +01:00
szymonsztuka
18393f27dd
Test doorman with selected dbs only for now (SQL Server and Azure SQL) - for ENT-1447. (#833)
Test doorman with selected dbs (SQL Server and Azure SQL) only in integration test in database mode since not all databases are supported now.
2018-05-17 16:27:02 +01:00
Matthew Nesbit
2b39e63a3f Wire up the maxMessageSize work in the bridge. 2018-05-17 15:51:42 +01:00
Katelyn Baker
a9ff1ac262 OS MERGE
Looks like Max Message size causes all sorts of issues in the bridge,
some fixes to some issues but this needs a lot more work
2018-05-17 15:21:37 +01:00
Katelyn Baker
74c5cffd38 Merge remote-tracking branch 'open/master' into kat-merge-20180517 2018-05-17 15:04:51 +01:00
Katelyn Baker
bbc80429be
Merge pull request #3072 from corda/kat/feature/amqp-rpc
CORDA-847 - AMQP RPC
2018-05-17 13:54:43 +01:00
josecoll
6aa971332d
Merge pull request #851 from corda/colljos-merge-160518
OS -> ENT merge
2018-05-17 13:17:01 +01:00
Kat Baker
0c3a30edc8 Corda-847 - Remove Kryo for RPC
It's no longer used as we've switched over to AMQP for RPC calls so
remove it from everywhere and only use it for checkpointing

 * Wire up demo bench post Kryo removal
 * Test Fixes
 * rebase and fix tests
 * Test Fix
 * wip
 * revert changes to api now we don't need to add annotations
2018-05-17 12:55:45 +01:00
Kat Baker
f850daa582 CORDA-847 - AMQP RPC
* Client and server support for amqp
 * Observable (and supporting) serialisers
   Unit Tests
 * Fixing tests
 * Test fixes
 * CORDA-847 - Update api doc with additon of @CordaSerializable annotation
 * TestFixes
 * review comments
 * TestFixes
 * Test Fix
 * Test Fix
 * Test Fix
 * Test Fix
 * Test Fix
 * Test Fix
 * TestFix
 * Test Fix
 * Review Comments
2018-05-17 12:53:38 +01:00
Chris Rankin
d09e9383e6
Fix build breakage with Gradle 4.7. (#3178) 2018-05-17 12:50:46 +01:00
josecoll
939e50d999
Vault Fungible Asset Query Criteria: removed incorrect reference in docs. (#2547)
* Removed incorrect reference.

* Removed reference to finance package class.
2018-05-17 11:41:10 +01:00
josecoll
a797c693fb Sync api-current.txt file.
Add missing JvmStatic annotation.
2018-05-17 10:59:49 +01:00
Matthew Nesbit
d9a647bdf0
Merge pull request #820 from corda/mnesbit-bridge-docs
Initial very basic docs for the bridge
2018-05-17 10:39:33 +01:00
Anthony Keenan
8ee9c5d5fc
CORDA-1280 Update api-current from v3.2 and use most recent version of api-scanner (#3153)
* Update api current from v3

* Update Cordapp Context as per CORDA-556

* Update Exception base classes as per CORDA-1334: port enterprise statemachine (#2964)

* Move notary service related classes and interfaces in core to internal (#2827)

* CordaRPCClient changes from CORDA-1099: Orchestrated clean shutdown from Shell (#2831)

* [CORDA-1264]: Ensure correct serialisation and masking for throwables raised by a node and propagated through RPC. (#2892)

* CORDA-973 Refactoring for serialization compression support (#2466)

* [CORDA-941]: Add NetworkParameters contract implementation whitelist. (#2580)

* Cleanup and improvements to the serialisation format of JacksonSupport (needed for CORDA-1238) (#3102)

* Existing internal exposures which need removing - see CORDA-1489

* revert to gradle plugins version of api-scanner
2018-05-17 10:09:12 +01:00
Matthew Nesbit
ac97bf4f31
Merge pull request #848 from corda/mnesbit-bridge-artemis-exponential-backoff
ENT-1597: Add exponential backoff to bridge Artemis reconnection
2018-05-17 10:01:14 +01:00
Patrick Kuo
0b76a12637
CORDA-864 Wire up max message size (#3057)
* add checks on message size
* added size check in AMQP bridge
* passing maxMessageSize to AMQPClient and server
* added Interceptor to enforce maxMessageSize on incoming messages
2018-05-17 09:59:30 +01:00
Joel Dudley
cb882ad694
Removes outdated information from scheduling tutorial. (#3175) 2018-05-17 09:09:07 +01:00
Matthew Nesbit
a5a860c52e First pass doc on the bridge.conf configuration file.
More doc work on bridge

Fixup docs with regard to HA changes discovered during testing

Link to bridge docs and add note about Zookeeper prerequisite.

Doc in progress

Add operating modes to overview doc

Change to BridgeInner from FloatInner

Add diagram to worked configuration section

Fix some typos and comments from PR reviews

Try to tidy up some of the wording.

Add new config properties and change to subsection headers for mode discussion
2018-05-17 08:52:49 +01:00
Michal Kit
0ee116a1d9
CORDA-1476 Adding TLS certificate CRL extension point configs (#3140)
* Adding TLS certificate CRL extension point configs

* Addressing review comments

* Addressing review comments - round 3
2018-05-17 08:21:24 +01:00
Matthew Nesbit
0b4e3ea5c7 Add exponential backoff to bridge Artemis reconnection 2018-05-17 08:17:09 +01:00
Matthew Nesbit
ca89854493
Merge pull request #849 from corda/mnesbit-bridge-configurable-zktopic
ENT-1597: Allow HA topic in zookeeper to be configurable and test it.
2018-05-17 08:13:08 +01:00
josecoll
b998901da4 Align API signature with OS. 2018-05-16 18:21:10 +01:00
josecoll
0cc1b5f4b9 Merge remote-tracking branch 'open/master' into colljos-merge-160518
# Conflicts:
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
2018-05-16 18:20:22 +01:00
josecoll
27803cdc9e
ENT-1887 Make sure open and enterprise API are identical (#3158)
* Sync public API's (and associated internal helpers) between Enterprise and OS.

* Add previous default constructor explicitly.

* Keep the API checker happy!

* Revert addition of ENT makeTestDataSourceProperties() function.
2018-05-16 18:01:53 +01:00
Thomas Schroeter
0318b73b85
Merge pull request #846 from corda/thomas-merge-3d50e73271cb3bbd95822575349995c9771729dd
Thomas merge 3d50e73271cb3bbd95822575349995c9771729dd
2018-05-16 16:46:42 +01:00
Tudor Malene
8e934df217
Fix db transaction check (#3164) 2018-05-16 15:55:51 +01:00
Thomas Schroeter
23a0a66128 Merge remote-tracking branch 'open-source/master' into thomas-merge-3d50e73271cb3bbd95822575349995c9771729dd 2018-05-16 15:30:46 +01:00
Thomas Schroeter
3d50e73271 Add configuration notary.serviceLegalName for clustered notaries 2018-05-16 15:19:14 +01:00
Matthew Nesbit
7cb6ed74d1 Allow HA topic in zookeeper to be configurable and test it. 2018-05-16 14:45:50 +01:00
Patrick Kuo
573210486d
snapshot should be all uppercase (#3123) 2018-05-16 14:40:47 +01:00
Andrzej Cichocki
65b782c206
ENT-933 Add spectator and participant profiles of rigorousMock (#3157) 2018-05-16 13:56:41 +01:00