Commit Graph

12170 Commits

Author SHA1 Message Date
d821f6d9e3 ENT-2035 / ENT-2037 Document JDBC driver in ./drivers directory (#939)
Enterprise tarball Corda distribution can only load JDBC jars from relative ./drivers directory.
The Capsule version can use directory specified by jarDirs config property and jarDirs was documented as a way to add JDBC drivers.
To make it consistent between tarball and Capsule version enterprise docs will be updated to use ./drivers dir, still preserving jarDirsbut state this option is not advisable and depending on the distribution may not work.
2018-06-07 10:35:00 +01:00
4bb548c09b [ENT-1894]: Change old log for new red-white one. (#941) 2018-06-06 17:02:58 +01:00
4527717923 Publish tools (database migration, network bootstrapper, blob inspector) to distribution repositories. (#938)
Remove references to doorman artifacts.
2018-06-06 15:33:28 +01:00
b823330a75 ENT-2036 handle ClosedChannelException during ssl handshake (#934)
* ENT-2036 handle ClosedChannelException during ssl handshake

* ENT-2036 address code review comments and revert AMQPChannelHandler as it will be fixed in OS first
2018-06-06 15:13:17 +01:00
4ba4e6d908 Merge pull request #940 from corda/tudor-merge-6-Jun
Tudor merge 6 jun
2018-06-06 15:12:36 +01:00
5232c2e0e3 Merge remote-tracking branch 'open/master' into tudor-merge-6-Jun 2018-06-06 13:38:45 +01:00
11b78296eb Merge pull request #936 from corda/os-merge-d620e71
O/S merge from d620e71
2018-06-06 13:27:03 +01:00
6a2e50b730 Blobinspector: trace level logging with --verbose (#3313) 2018-06-06 13:19:18 +01:00
5f2c3d175d ENT-2036 Handle ClosedChannelException during SSL handshake (#3314) 2018-06-06 13:08:33 +01:00
e2b4943bbb Observable toposort for transactions (#3027) 2018-06-06 13:58:23 +02:00
468c0c7404 CORDA-1349: Docs: improve docs on permissioning, doorman and network map. (#3277)
* Docs: improve docs on permissioning, doorman and network map.

* Add a convenience serialization API for Java users, marked as
internal for now with a TODO to make it public after we start work on
Corda 4.0. Otherwise serializing arbitrary objects to AMQP is awkward.
2018-06-06 13:57:25 +02:00
2aac9e8687 Merge pull request #921 from corda/ENT-1983
ENT-1983: throw more specific exception when starting a flow as a result
2018-06-06 12:09:10 +01:00
d675a17e17 ENT-2023 Restore rpcThreadPoolSize enterprise config setting (#922)
* Add a sampler for EmptyFlow, and also re-establish wiring to the rpcThreadPoolSize config parameter.

* Remove mutex from multi-threaded SMM startFlow

* Add EmptyFlow to nightly benchmark and also a CashIssue 200
2018-06-06 11:47:37 +01:00
f34a2bd33f Replacing uses of assert with require 2018-06-06 09:56:04 +01:00
11fd70a1f7 Merge remote-tracking branch 'open/master' into os-merge-d620e71
# Conflicts:
#	node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
2018-06-06 09:51:29 +01:00
9a4abf92c5 Merge pull request #930 from corda/parkri-os-merge-20180605-2
OS -> ENT merge
2018-06-06 07:21:13 +01:00
d620e71bb6 Replaced all uses of assert with require (#3309)
JVM assertions have to be enabled with the -ea flag so it's possible for these checks to be ignored.
2018-06-06 00:31:41 +01:00
75f2c4a0a4 Removed flow-library doc page as it's redundant (#3307) 2018-06-05 21:43:03 +01:00
a7e4993567 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180605-2 2018-06-05 20:10:20 +01:00
7e3e94cee9 OS -> ENT merge (#928)
* Revert back logging of tests (#3305)

* ENT-2023 Minimise code diff between OS and ENT for enterprise change since code diff during merge resulted in a bad merge relating to rpcThreadPoolSize. (#3306)
2018-06-05 19:53:07 +01:00
f4621d9a74 [CORDA-1297] Column nullability in migrations (#916)
* Migrations to proper nullability

* Removed node-core.changelog-v3-GA.xml file as indicated by PR comments, This change was already provided by nullability upgrade commits
2018-06-05 18:13:49 +01:00
e2a2c2d20d ENT-2023 Minimise code diff between OS and ENT for enterprise change since code diff during merge resulted in a bad merge relating to rpcThreadPoolSize. (#3306) 2018-06-05 17:38:55 +01:00
b0f5b81d26 Merge pull request #926 from corda/mnesbit-merge-20180605
ENT-2027: Merge from open source
2018-06-05 16:05:09 +01:00
baa73ab141 Revert back logging of tests (#3305) 2018-06-05 15:58:38 +01:00
c2f22e18a5 Corda Behave framework updates to decouple from Network Services (#914)
* Added new 'eventHorizonDays' configuration item.

* Added custom authenticator to provide ARTIFACTORY credentials upon resolving protected internal URL.

* Re-pointed functional test scenarios to point to Enterprise master.

* Enterprise corda network scenarios to use NetworkBootstrapper tool (instead of Doorman/NMS) since decision made by Product Management to split out Doorman/NMS from Enterprise.

* Configuration parameter changed to 'runMigration' since DP3.

* Fixed problem with logger upon startup.

* General improvements and additions to setup and execution scripts (eg. SIMM valuation demo now consists of 3 separate jars)

* Updates to decouple from Network Services.

* Download all JARs from artifactory for a given published distribution.

* Add TODOs for Doorman/NMS rework.

* Addressing TL PR review comments.

* Additional instructions for setting up the environment and running QA tests.

* Fixed repository URL references.
2018-06-05 15:02:07 +01:00
4882e2e089 Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180605 2018-06-05 13:37:35 +01:00
0812329aaf The logic in my recent late start bridge PR was wrong. This doesn't affect embedded bridges, but for external bridges the state doesn't reset correctly on bridge restart. (#3301) 2018-06-05 13:30:20 +01:00
086b9daa6e Updates the setup instructions to be IntelliJ 2018 compatibile. (#3299) 2018-06-05 10:57:29 +01:00
010c30f6d4 DOCS - Remove references to webAddress since it's no longer a valid option (#3293) 2018-06-05 10:57:19 +01:00
ee5851b56a Update CONTRIBUTORS.md 2018-06-05 10:43:17 +01:00
d86ae5fc0b I set the max retry time for AMQP at 5 minutes. This is just too long for any kind of sensible testing, so drop back to 1 minute. (#3294) 2018-06-05 10:30:35 +01:00
4de4e8a3ef Merge pull request #923 from corda/merges/june-05-09-57
Merges June 05 at 09:57
2018-06-05 10:17:45 +01:00
7bf6608c8e Fixes webport numbers based on recent build.gradle changes. (#3298) 2018-06-05 10:15:47 +01:00
61127fe65f Merge remote-tracking branch 'remotes/open/master' into merges/june-05-09-57 2018-06-05 09:58:28 +01:00
e34bce9f3f [CORDA-1582]: Shell is back to logging only useful information. (#3296) 2018-06-05 09:25:47 +01:00
ff8471341f Removes Log4J from Core. Readds to shell where required. (#3257)
* Removes Log4J dependency from `core`.

* Adds dependency on Log4J directly to shell. Missing colons.
2018-06-04 23:24:36 +01:00
d989ae9dcc Stray backtick. 2018-06-04 23:20:26 +01:00
993737aecc Merge pull request #919 from corda/merges/os-2018-06-04-szymon
OS -> ENT merge on 2018-06-04
2018-06-04 22:16:26 +01:00
644f1c6d2f ENT-1983: throw more specific exception when starting a flow as a result
of P2P messaging and SMM is stopped.
2018-06-04 19:03:36 +01:00
da22c2511d Table name node_attchments_contracts change in SQL setup scritps following fix for CORDA-1499 merged from OS. 2018-06-04 19:00:38 +01:00
703f0cc86f Liquibase script for a table name node_attchments_contracts change following fix for CORDA-1499 merged from OS. 2018-06-04 17:53:01 +01:00
f5c9a398ad Merge remote-tracking branch 'remotes/open/master' into merges/os-2018-06-04-szymon
# Conflicts:
#	docs/source/upgrade-notes.rst
#	node/src/integration-test/kotlin/net/corda/node/BootTests.kt
2018-06-04 17:35:19 +01:00
4f1a22dfac Merge pull request #910 from corda/tudor-merge-os-01_06
Tudor merge os 01 06
2018-06-04 15:37:33 +01:00
3b65ca2ab6 Temporary ignore flaky Test to unblock merge 2018-06-04 14:13:59 +01:00
18a6e2fa2a CORDA-1477 backport Ent test fixes (#3292) 2018-06-04 13:49:25 +01:00
141d45c39d Add simulation of the avalanche consensus protocol to experimental (#3283) 2018-06-04 13:33:34 +01:00
29da4b02a6 Fix tests 2018-06-04 11:58:41 +01:00
3e5b409af4 DEVOPS-663 Test file for overnight run (#913)
* Update name of simple notary

* Fix notary name
2018-06-04 11:29:34 +01:00
63f11d0b54 Upgrade integration test for CORDA-1356 to run in database mode (#899)
Add SQL setup to run integration test in database mode, add ordering in test because original assumption that rows are returned as inserted doesn't work in Oracle db, ensure distinct names when starting nodes (they can't clash in database mode, as the schema name is taken from node name).
2018-06-04 10:31:56 +01:00
71d8586e61 ENT-1962: throw a clearer exception when starting RPC flow while SMM is stopped … (#912)
* ENT-1962: throw a clearer exception when starting RPC flow while SMM is stopped.

* ENT-1962: update exception constructor
2018-06-04 10:14:53 +01:00