Commit Graph

12808 Commits

Author SHA1 Message Date
88158000e4 Fix merge conflict. 2018-07-26 10:31:03 +01:00
934109327c Merge commit '78b61d4ae4d349aa7966dd0c9637d373f2df48d6' into chrisr3-os-merge 2018-07-26 10:22:33 +01:00
aec217a065 Merge pull request #1302 from corda/df-merge-2018-07-25
Df merge 2018 07 25
2018-07-26 09:47:15 +01:00
8dbb9eb07f Fix compile errors post merge 2018-07-25 18:37:30 +01:00
e8eb4c9bf6 Fix merge conflicts 2018-07-25 18:19:07 +01:00
3647a10aa5 notary healthcheck improvements (#1298)
* Use correct asserts in unit tests

* gradle tweaks

* Remove unneeded imports

* Minor code review changes

* Use version var
2018-07-25 18:09:04 +01:00
9c89e3babd Merge commit '121dbec87700856679baab3995352448e8214b4e' into df-merge-2018-07-25 2018-07-25 18:00:24 +01:00
3259c4b64a Tudor merge os 25 jul (#1299)
* Feature/corda 1813/change postgres column type (#3631)

* CORDA-1813 fix Postgres db bloat issue

* CORDA-1813 merge fixes

* CORDA-1813 change column type and size to a standard corda type

* CORDA-1813 docs

* CORDA-1813 create custom hibernate type for the checkpoint blob and align with enterprise

* CORDA-1813 Remove max col size

* CORDA-1813 Remove max col size

* CORDA-1813 Fix merge

* CORDA-1813 Remove buggy :serverNameTablePrefix: configuration

* CORDA-1813 fix merge
2018-07-25 15:21:51 +01:00
78b61d4ae4 ENT-1463, ENT-1903: Only build deterministic modules when using JDK8. (#3643) 2018-07-25 13:45:16 +01:00
9571f7d905 Removes Identity page. Reworks it into the Network page. (#3687)
* Removes Identity page. Reworks it into the Network page.

* Removes stray doorman reference.

* Addresses review feedback.
2018-07-25 13:13:10 +01:00
da3b5d85dd Merge pull request #1297 from corda/chrisr3-os-merge
Merge up to 0b0ad71b
2018-07-25 12:51:20 +01:00
8d19ef54fd Fix Notary Healthcheck not to run unit tests when assembling. 2018-07-25 11:11:45 +01:00
1f74d957ff Merge commit '0b0ad71b3c38c176f85501882de0d4f4c884bfc6' into chrisr3-os-merge 2018-07-25 10:43:57 +01:00
31c353990a Merge pull request #1296 from corda/os-merge-757181e
O/S merge from 757181e
2018-07-25 10:17:32 +01:00
6b320026a1 CORDA-916 separate test startednode (#3675)
* Push start() implementation back into base

* Narrow access

* Optimise imports

* Fix tests

* Get Java test compiling
2018-07-25 10:05:50 +01:00
121dbec877 Merge pull request #3684 from EricMcEvoyR3/master
Docs added MacOSX version of Intellij Project Structure JDK Set-Up
2018-07-25 10:00:52 +01:00
40fc56f2ea Feature/corda 1813/change postgres column type (#3631)
* CORDA-1813 fix Postgres db bloat issue

* CORDA-1813 merge fixes

* CORDA-1813 change column type and size to a standard corda type

* CORDA-1813 docs

* CORDA-1813 create custom hibernate type for the checkpoint blob and align with enterprise

* CORDA-1813 Remove max col size

* CORDA-1813 Remove max col size

* CORDA-1813 Fix merge

* CORDA-1813 Remove buggy :serverNameTablePrefix: configuration
2018-07-25 09:52:57 +01:00
0b0ad71b3c CORDA-1832: Configure Quasar dependency using quasar-utils plugin. (#3685) 2018-07-24 20:19:12 +01:00
d040945b0e Merge fixes 2018-07-24 18:37:04 +01:00
73ec84a0bc Docs added MacOSX version of Intellij Project Structure JDK Set-Up 2018-07-24 17:33:55 +01:00
02fae5f385 Merge remote-tracking branch 'open/master' into os-merge-757181e
# Conflicts:
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/integration-test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
#	node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
#	node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
#	node/src/test/kotlin/net/corda/node/services/identity/PersistentIdentityServiceTests.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalMockNetwork.kt
2018-07-24 17:04:51 +01:00
757181e26d Docs don't make it clear that folder should be selected, not parent folder. (#3678) 2018-07-24 16:42:34 +01:00
d4f0e0f8e0 Ordered starting of node components and clear dependencies between them (#3664)
Moved start up logic of the various node components out of their c’tors and into “start” methods, which are called from Node.start(). The components themselves are created in the Node’s c’tor with minimal initialisation logic.

Certain things are not immediately available at construction time, which are instead given to the components at start time in an orderly fashion:

* Certs from the node’s key store and trust store
* The network parameters, and thus access to things like maxMessageSize and the contracts whitelist
* A running database - several components were doing database stuff their c’tors
* The node’s NodeInfo, and thus access to things like identities and addresses

The messaging service couldn’t be created in the Node’s c’tor due to initialisation issues with MockNode. This should be fixed in a later commit.
2018-07-24 16:13:21 +01:00
333970ae18 ENT-1993: Documentation for notary health check (#1287)
* Documentation for notary health check

* Doc improvements after review

* Indent (stop messing with this, IntelliJ!)

* Ordering, correct number

* Review comments
2018-07-24 14:41:53 +01:00
8027a11420 ENT-1993 Simplified notary healthcheck tool (#1286)
* Moved notary healthcheck

* Rename directories and fix up build

* Moved notary healthcheck to tools

* Fix up gradle files and move long running tests to integration-test

* Add copyright headers

* Remove obsolete resource

* Break up large `call()` function, move helpers to be private in companion object

* Move ScheduledCheckFlow to its own file

* Docs etc.

* Code review: Replace magic literals by constants, enums, etc.

* Delete Readme.md (the content will be available in documentation)

* Slight refactoring of the handling flows.

* Publishing

* Fix test

* Add missing artifactory dependency

* Small documentation fixes

* Typo
2018-07-24 14:41:31 +01:00
0e9b04a6d0 Prefer files to paths when configuring ProGuard. (#3679) 2018-07-24 13:52:45 +01:00
4906ec277f Merge pull request #1295 from corda/os-merge-20180724
Os merge 20180724
2018-07-24 13:17:05 +01:00
f4b778667d Fix AbstractNode imports 2018-07-24 11:43:07 +01:00
4708c62de4 Merge remote-tracking branch 'open/master' into os-merge-20180724
# Conflicts:
#	CONTRIBUTORS.md
#	docs/source/contributing.rst
#	docs/source/corda-configuration-file.rst
#	docs/source/index.rst
#	node/src/integration-test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	settings.gradle
2018-07-24 11:33:21 +01:00
2a5b7371d0 h2 cash selection query to support multiple onlyFromIssuerParties and… (#3659)
* h2 cash selection query to support multiple onlyFromIssuerParties and withIssuerRefs

* Rid of the compilation warnings
2018-07-24 10:09:37 +01:00
b9efbaa228 CORDA-1585 - Tidy up participate docs + pdf toctree backport (#3674)
* Fix TOC for HTML and PDF (Backport from Enterprise docs)

* Tidy up participate section

* Address review comments
2018-07-24 10:05:57 +01:00
c275f1ff0f Merge pull request #1292 from corda/merges/july-23-11-26
Merges: July 23rd at 11:26
2018-07-23 20:14:22 +01:00
824651d677 Fixed a compilation error. 2018-07-23 19:35:13 +01:00
81b9885f03 Fixed a compilation error. 2018-07-23 17:16:24 +01:00
f142e491cc Fixed a compilation error. 2018-07-23 16:58:12 +01:00
927c6ab28b Fixed a compilation error. 2018-07-23 16:53:50 +01:00
32299a0811 Fixed a compilation error. 2018-07-23 16:48:34 +01:00
14458c6434 Update CONTRIBUTORS.md 2018-07-23 16:44:13 +01:00
c2550d2871 Revert merge commit changes. (#3673) 2018-07-23 16:24:34 +01:00
a4d65dae22 Merge remote-tracking branch 'remotes/open/master' into merges/july-23-11-26
# Conflicts:
#	confidential-identities/src/test/kotlin/net/corda/confidential/IdentitySyncFlowTests.kt
#	docs/source/changelog.rst
#	node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/BFTSMaRtTests.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoader.kt
#	node/src/main/kotlin/net/corda/node/internal/cordapp/ManifestUtils.kt
#	node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
#	node/src/test/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoaderTest.kt
#	node/src/test/kotlin/net/corda/node/messaging/TwoPartyTradeFlowTests.kt
#	node/src/test/kotlin/net/corda/node/services/TimedFlowTests.kt
#	settings.gradle
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
2018-07-23 15:22:39 +01:00
a7b1175833 Extended docs on h2settings (#3669)
* Extended docs on h2settings

* Documents h2port being deprecated in favour of h2settings.

* Fixes link.

* Capitalisation
2018-07-23 14:15:09 +01:00
a0183fbdfd Removed PersistentNetworkMapCache.start() (#3661)
The loading of all node infos in the start method was unnecessary, both for the changePublisher and _loadDBSuccess, and the setting of _registrationFuture was incorrect.
2018-07-23 14:01:14 +01:00
6a895401c5 series0ne/corda-demobench-cordapp-select (#3543)
Adds the ability to multi-select CorDapp JARs for node profiles.
2018-07-23 12:34:07 +01:00
2de789877a Update CONTRIBUTORS.md 2018-07-23 12:33:56 +01:00
94fb5a6538 Defaulting values to true for now. (#3668) 2018-07-23 12:18:28 +01:00
694f6bafbf Updates PR checklist (#3667) 2018-07-23 11:57:36 +01:00
403a165ab6 Make it clear that must restart node after installing CorDapp. (#3666) 2018-07-23 11:37:44 +01:00
abc1d99eaa [CORDA-1799]: Avoid generating test CorDapp JARs from each out of process node started by the driver (#3641) 2018-07-23 11:18:11 +01:00
e7f3847839 Merge branch 'master' of https://github.com/corda/corda 2018-07-23 11:10:19 +01:00
5db90af332 Fix integration test to run in database mode (#1289)
Ensure ArtemisMessagingTest and  RaftTransactionCommitLogTests use H2 when running in remote database mode.
2018-07-23 10:34:59 +01:00