ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-16 09:05:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
12,788 Commits 99 Branches 407 Tags
Commit Graph

1992 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Nick Arini
0c0d9b7906
Azure template guide (#1282) 
* Azure template guide and testnet docs update
 2018-07-20 16:29:10 +01:00
cxyzhang0
d2446be69e MSSQL support (#3382) 
* MSSQL support

* changes per reviewer's comments; doc

* clean up

* CONTRIBUTORS.md

* minor change in comment

* another minor change in comment

* minor formatting

* Comments formatting per recommend style; contributors in alphabet order

* more comment formatting per coding style

* Change MSSQL to SQLServer in codes and comments

* Change MSSQL to SQLServer in doc

* Use generateSequence to build repeats of ?,?,...?
 2018-07-20 16:25:15 +01:00
Nick Arini
e5d82cc9b4
Na testnet explorer docs (#3660) 
* added doc on testing deployment with node explorer
 2018-07-20 16:21:24 +01:00
Michele Sollecito
fae30c8703
Merge pull request #1285 from corda/2018-07-19 
OS merge 2018-07-19
 2018-07-20 14:12:57 +01:00
szymonsztuka
6e91fcbb32
Enable new test to run in remote database mode - add SQL setup, add finance packages to create tables by Liquidate. (#1284) 2018-07-20 14:09:58 +01:00
Jonathan Sphar
cad684fbd3 Add Ubuntu environment setup instructions to docs/getting-set-up (#3608) 
* remove network simulator references in docs

* Added environment setup instructions for Ubuntu

* Revert "Upstream merge"

This reverts commit db4920fa6801fe9903e45f54feea8b81772fdf25, reversing
changes made to 208ac49da0caaf0dfc5ade9f8bd8a49d13f17aae.

* Address review comments
 2018-07-20 11:55:32 +01:00
Dominic Fox
62c2e1c892 OS merge 2018-07-19 2018-07-19 16:43:46 +01:00
Konstantinos Chalkias
a94dbc9c9a
Change SZ to CZ in the cert hierarchy diagram (#3655) 2018-07-19 16:07:50 +01:00
Nick Arini
82d7ec0729
Na testnet screenshots (#3647) 
* update docs/screenshots
 2018-07-18 16:38:30 +01:00
Joel Dudley
08b5cb6d5f
Remove old future to event horizon not being implemented. (#3642) 2018-07-18 11:05:30 +01:00
Chris Rankin
aa50aaf95d Merge commit 'e879de7' into chrisr3-os-merge 2018-07-17 22:47:24 +01:00
James Brown
dafd979bde CORDA-1818 - fix markup in h2 docs (#3629) 2018-07-17 17:47:46 +01:00
Konstantinos Chalkias
8a54badc6a
CORDA-1514 Add our patented nested Merkle trees protocol to documentation 2018-07-17 15:36:10 +01:00
Shams Asari
921b132658
Deprecated freeLocalHostAndPort, freePort and getFreeLocalPorts of TestUtils (#3630) 
They're prone to cause flaky tests due to the "allocated" ports already being taken by the system when eventually needed. Replaced usages with PortAllocation.Incremental.

Affected unit tests made into integration tests to avoid any issues in the future when unit tests are made to run in parallel.
 2018-07-17 14:42:30 +01:00
Konstantinos Chalkias
a8fa232301
CORDA-1516 - Adding notary to key-concepts-transactions (#3502) 
also decided not to include info about privacy salt (as too complex)
 2018-07-17 11:53:53 +01:00
Nick Arini
aee2377f4f Add a doc on local configuration for a Corda testnet node. (#3623) 
* Add a page on local deployment

* Add a page on local deployment

* Fix typos

* add image

* Added warning on copying nodes.

* Added warning

* Fix reviewer comments

* Update index

* broken note

* typo
 2018-07-17 10:45:46 +01:00
Andrius Dagys
1cffe1b080 Docs: update notary setup page 2018-07-17 11:26:55 +02:00
Florian Friemel
1ca2059863
[CORDA-1635] Update docs (node naming constraints). (#3595) 
* Update docs (node naming constraints).

* Update CordaX500NameTest to ensure consistency with the docs.

* Respond to feedback.
 2018-07-16 17:29:29 +01:00
Andrius Dagys
a1cb184a1d ENT-2168: Node internal docs tweaks (#3624) 2018-07-16 17:13:43 +01:00
Shams Asari
ca56f6bd33
Fixed out-of-date integration testing tutorial and added Java example (#3596) 2018-07-16 13:14:57 +01:00
szymonsztuka
9f905da036
Missing upgrade notes for table change in v3.1 - related to CORDA-1804 (#3567) 
Document different upgrade notes for table name change from v3.0 or from v3.1/v3.2 to the current version (a table change introduced in v3.1 was not documented in upgrade notes).
 2018-07-16 11:43:24 +01:00
Andras Slemmer
382d65fbb1
Merge pull request #3289 from corda/CORDA-1578/aslemmer-smm-extension-docs 
CORDA-1578: Add flow state machine extension tutorial
 2018-07-16 11:16:10 +01:00
Anthony Keenan
a4ad4c7563
CORDA-1725 Add documentation on building Corda for Win/*nix and clean up doc bui… (#3578) 
* Add documentation on building Corda for Win/*nix and clean up doc building documentation

* Split up building corda instructions from building docs instructions

* Address review comments
 2018-07-13 22:12:20 +01:00
Rick Parker
52eb5d76d3
Merge pull request #1272 from corda/parkri-os-merge-20180713-1 
OS -> ENT merge
 2018-07-13 18:05:29 +01:00
szymonsztuka
208ac49da0
CORDA-1804 Corda node stops when detecting not migrated node_attachments_contracts table name (#3593) 
Database table NODE_ATTACHMENTS_CONTRACT_CLASS_NAME in v3.0 was changed to NODE_ATTCHMENTS_CONTRACTS in v3.1 and then finally NODE_ATTACHMENTS_CONTRACTS on current master. Users may omit the upgrade note and run into errors. After the change the node will not start if the new table name is not found and any other older ones is found.
 2018-07-13 16:23:20 +01:00
rick.parker
4e81d26985 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180713-1 2018-07-13 13:15:53 +01:00
Tommy Lillehagen
84d387c034 Fix "getting set up" link (#1270) 2018-07-13 13:09:55 +01:00
Nick Arini
b55a287311
How to test an ent node on testnet doc page (#1265) 
* add doc on testing with explorer
 2018-07-13 11:06:04 +01:00
Rick Parker
ed25d8f1be
ENT-1565 Upgrade Artemis version to latest. (#3557) 
* ENT-1565 Upgrade Artemis version to latest.

* Fix compiler errors.

* Add to changelog

* Additional commentary on Proton-J version
 2018-07-13 10:10:26 +01:00
Thomas Schroeter
e90d7c69c5
Minor: doc fixes (#3584) 2018-07-13 09:58:05 +01:00
Tommy Lillehagen
f7a4c19656 CORDA-1803 - Fix variable replacement (#3585) 2018-07-13 09:40:02 +01:00
Joel Dudley
98117392db
Stray full-stop 2018-07-12 17:52:16 +01:00
Mike Hearn
db1e33c820 Docs: clean up the toctree a little bit w.r.t. serialisation and tools 2018-07-12 18:42:19 +02:00
Mike Hearn
20c03d2196 Blob inspector: add support for hex and base64 inputs. 
Also rename the file to make it easier to navigate to it in IntelliJ
by keyboard.
 2018-07-12 18:42:19 +02:00
Joel Dudley
21754e4323
Removes reference to Discourse. (#3581) 2018-07-12 17:40:10 +01:00
Joel Dudley
d8cd83bf4f
Removes duplicated instructions for running example CorDapp. (#3579) 2018-07-12 17:34:13 +01:00
Andras Slemmer
18a9155e89 Add java samples 2018-07-12 15:30:23 +01:00
Andras Slemmer
8c1ea4a61d Fix test 2018-07-12 15:30:23 +01:00