Commit Graph

2162 Commits

Author SHA1 Message Date
1531511096 Merge pull request #1291 from corda/amoothart-network-doc-typos
doc fixes
2018-07-27 11:58:52 -04:00
666b1d0faf Reflects network builder docs on Master. (#3709) 2018-07-27 16:50:53 +01:00
bb7d33380f Merge remote-tracking branch 'open/master' into kat-merge-27072018
Conflicts:
	core/src/main/kotlin/net/corda/core/internal/notary/NotaryServiceFlow.kt
	core/src/main/kotlin/net/corda/core/internal/notary/TrustedAuthorityNotaryService.kt
	docs/source/blob-inspector.rst
	docs/source/release-notes.rst
	docs/source/upgrade-notes.rst
	node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
2018-07-27 16:09:26 +01:00
42a4b9f406 ENT-2294: CE HA deployment documentation refers to persistent mount commands but none are shown
Missing carriage returns caused rendering to fail.  Also changed from groovy to bash because it is.
2018-07-27 15:38:40 +01:00
403407a919 ENT-2298: CE Hello World Tutorial Page references Corda V1.0
Removed version number completely from text, I thought this made more sense than hardcoding a version which will almost immediately be out of date.
2018-07-27 15:19:44 +01:00
ed088562f6 ENT-2302: Hello World Tutorial Page mismatch between code sample and explanatory text
Updated text to reflect the correct method.
2018-07-27 15:14:42 +01:00
70346c45b3 ENT-2305: Java Instructions to Invoke Hello World CordApp fail
Removed 'Java' instructions
2018-07-27 15:10:11 +01:00
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
4075e29120 Fixes formatting. Fixes link. (#3693) 2018-07-26 10:09:35 +01:00
cdddd84e6b Fix link to blob inspector download page (#3691) 2018-07-25 18:38:13 +01:00
333b8d0658 RELEASE - Update upgrade and release notes on master post V3.2 (#3683) 2018-07-25 18:04:02 +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
8207ac3222 CORDA-1332 Reference input states (#3525)
* * First commit for reference input states feature.

* Added docs.
* Added additional test.

* Fixed whitespace.

* Rebased to master.
* Updated Raft and persistent notary implementations.

* Updated changelog.

* Updated topo sort to handle reference states.
* Stubbed out with referenced states flow.

* Added WithReferencedStatesFlow.
* Added Tests for WithReferencedStatesFlow.
* Added ReferenceState type.
* Rebased to latest version of master.

* Added better comments.
* Updated unit test.

* Added comment to explain a little hack.
* Fixed broken contract upgrade RPC test.

* Added minimum platform version check.
* Updated mock network so that notary nodes inherit the platform version set by the network's minimum platform version.
* References states can now only be used when minimum platform version >= 4.

* Created a new file to hold async operations as "WaitForStatesToUpdate" is broadly reusable.
* Refactored WithReferenceStatesFlow

* Updated javadoc for WaitForStatesToUpdate aysnc operation.

* Added network parameters property to InternalMockNetwork.

* Added min platform version capability to mock services.

* Removed erroneous chars from file.

* Made async operation internal and now call it from FlowLogic.
* Moved some transaction checking code around.

* Removed serializable annotation from referenced state and ref.
* Added reference states design doc.
* Added missing KDocs.
* Updated with reference states flow to handle consecutive update races.
* Made platform version info an inheritable thread local.
* Fixed various typos.
* Updated docs.

* Fixed race.

* Removed min platform version checks as API needs more thought.

* Added deprecation to method and supressed warnings.

* Renamed WaitForStatesToUpdate to WaitForStateConsumption.
* Fixed race in WaitForStateConsumption.

* Addressed PR comments and updated comments / KDocs.

* Reverse vault bugfixes.

* * Vault bug fixes.

* * Fixed broken test.
* Moved WaitForStateConsumption to internal package.
2018-07-25 14:06:56 +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
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
c36aac5f5d consistent cert organization 2018-07-24 16:08:39 -04: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
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
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
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
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
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
c5e93cf5a4 Remove files not wanted in ent documentation 2018-07-23 09:06:43 +01:00
6427eb3937 ENT-2296 - Fix typo in docs (#3665) 2018-07-23 08:51:52 +01:00
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
624e1cbfe4 using TLS 1.2 2018-07-20 16:09:57 -04:00
0c0d9b7906 Azure template guide (#1282)
* Azure template guide and testnet docs update
2018-07-20 16:29:10 +01:00
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
e5d82cc9b4 Na testnet explorer docs (#3660)
* added doc on testing deployment with node explorer
2018-07-20 16:21:24 +01:00
fae30c8703 Merge pull request #1285 from corda/2018-07-19
OS merge 2018-07-19
2018-07-20 14:12:57 +01:00
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
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 db4920fa68, reversing
changes made to 208ac49da0.

* Address review comments
2018-07-20 11:55:32 +01:00
62c2e1c892 OS merge 2018-07-19 2018-07-19 16:43:46 +01:00
a94dbc9c9a Change SZ to CZ in the cert hierarchy diagram (#3655) 2018-07-19 16:07:50 +01:00
82d7ec0729 Na testnet screenshots (#3647)
* update docs/screenshots
2018-07-18 16:38:30 +01:00
08b5cb6d5f Remove old future to event horizon not being implemented. (#3642) 2018-07-18 11:05:30 +01:00
aa50aaf95d Merge commit 'e879de7' into chrisr3-os-merge 2018-07-17 22:47:24 +01:00
dafd979bde CORDA-1818 - fix markup in h2 docs (#3629) 2018-07-17 17:47:46 +01:00
8a54badc6a CORDA-1514 Add our patented nested Merkle trees protocol to documentation 2018-07-17 15:36:10 +01:00
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
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
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
1cffe1b080 Docs: update notary setup page 2018-07-17 11:26:55 +02:00