ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-19 18:45:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
13,302 Commits 99 Branches 407 Tags
Commit Graph

13302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Rankin
78b61d4ae4
ENT-1463, ENT-1903: Only build deterministic modules when using JDK8. (#3643) 2018-07-25 13:45:16 +01:00
Joel Dudley
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
Chris Rankin
da3b5d85dd
Merge pull request #1297 from corda/chrisr3-os-merge 
Merge up to 0b0ad71b
 2018-07-25 12:51:20 +01:00
Chris Rankin
8d19ef54fd Fix Notary Healthcheck not to run unit tests when assembling. 2018-07-25 11:11:45 +01:00
Chris Rankin
1f74d957ff Merge commit '0b0ad71b3c38c176f85501882de0d4f4c884bfc6' into chrisr3-os-merge 2018-07-25 10:43:57 +01:00
Shams Asari
31c353990a
Merge pull request #1296 from corda/os-merge-757181e 
O/S merge from 757181e
 2018-07-25 10:17:32 +01:00
Dominic Fox
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
Eric McEvoy
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
Tudor Malene
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
Austin Moothart
c36aac5f5d consistent cert organization 2018-07-24 16:08:39 -04:00
Chris Rankin
0b0ad71b3c
CORDA-1832: Configure Quasar dependency using quasar-utils plugin. (#3685) 2018-07-24 20:19:12 +01:00
Shams Asari
d040945b0e Merge fixes 2018-07-24 18:37:04 +01:00
EricMcEvoyR3
73ec84a0bc Docs added MacOSX version of Intellij Project Structure JDK Set-Up 2018-07-24 17:33:55 +01:00
Shams Asari
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
Joel Dudley
757181e26d
Docs don't make it clear that folder should be selected, not parent folder. (#3678) 2018-07-24 16:42:34 +01:00
Shams Asari
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
Christian Sailer
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
Christian Sailer
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
Chris Rankin
0e9b04a6d0
Prefer files to paths when configuring ProGuard. (#3679) 2018-07-24 13:52:45 +01:00
Anthony Keenan
4906ec277f
Merge pull request #1295 from corda/os-merge-20180724 
Os merge 20180724
 2018-07-24 13:17:05 +01:00
Anthony Keenan
f4b778667d Fix AbstractNode imports 2018-07-24 11:43:07 +01:00
Anthony Keenan
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
cxyzhang0
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
Anthony Keenan
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
Michele Sollecito
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
Michele Sollecito
824651d677 Fixed a compilation error. 2018-07-23 19:35:13 +01:00
Michele Sollecito
81b9885f03 Fixed a compilation error. 2018-07-23 17:16:24 +01:00
Michele Sollecito
f142e491cc Fixed a compilation error. 2018-07-23 16:58:12 +01:00
Michele Sollecito
927c6ab28b Fixed a compilation error. 2018-07-23 16:53:50 +01:00
Michele Sollecito
32299a0811 Fixed a compilation error. 2018-07-23 16:48:34 +01:00
Joel Dudley
14458c6434
Update CONTRIBUTORS.md 2018-07-23 16:44:13 +01:00
josecoll
c2550d2871
Revert merge commit changes. (#3673) 2018-07-23 16:24:34 +01:00
Michele Sollecito
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
Joel Dudley
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
Shams Asari
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
Matthew Layton
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
Joel Dudley
2de789877a
Update CONTRIBUTORS.md 2018-07-23 12:33:56 +01:00
Michele Sollecito
94fb5a6538
Defaulting values to true for now. (#3668) 2018-07-23 12:18:28 +01:00
Joel Dudley
694f6bafbf
Updates PR checklist (#3667) 2018-07-23 11:57:36 +01:00
Joel Dudley
403a165ab6
Make it clear that must restart node after installing CorDapp. (#3666) 2018-07-23 11:37:44 +01:00
Michele Sollecito
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
josecoll
e7f3847839 Merge branch 'master' of https://github.com/corda/corda 2018-07-23 11:10:19 +01:00
szymonsztuka
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
Anthony Keenan
ae13fc052b
Merge pull request #1290 from corda/os-merge-20180722 
Os merge 20180722
 2018-07-23 10:24:03 +01:00
Anthony Keenan
c5e93cf5a4 Remove files not wanted in ent documentation 2018-07-23 09:06:43 +01:00
Tommy Lillehagen
6427eb3937 ENT-2296 - Fix typo in docs (#3665) 2018-07-23 08:51:52 +01:00
Anthony Keenan
168664f7a8 Merge remote-tracking branch 'open/master' into os-merge-20180722 
# Conflicts:
#	CONTRIBUTORS.md
#	constants.properties
#	docs/source/aws-vm-explore.rst
#	docs/source/azure-vm-explore.rst
#	docs/source/corda-networks-index.rst
#	docs/source/gcp-vm.rst
#	docs/source/getting-set-up.rst
#	docs/source/node-database.rst
#	finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt
#	finance/src/main/resources/META-INF/services/net.corda.finance.contracts.asset.cash.selection.AbstractCashSelection
#	node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
 2018-07-22 23:06:43 +01:00
Anthony Keenan
7853cfe003
[CORDA-1482] Make boolean config variables case insensitive (#3622) 
* Make boolean config variables case insensitive

* Address review comments
 2018-07-21 11:54:02 +01:00
Austin Moothart
624e1cbfe4
using TLS 1.2 2018-07-20 16:09:57 -04:00
Nick Arini
0c0d9b7906
Azure template guide (#1282) 
* Azure template guide and testnet docs update
 2018-07-20 16:29:10 +01:00