75c9c50abe
Merge branch 'open/master-ba7727a4e1' into andrius/merge-10-22
2018-10-22 15:38:28 +01:00
e0d8ea8a58
CORDA-535: Move implementation specific configuration values out of n… ( #4058 )
...
The configuration objects for specific notary implementations have been replaced
by a single untyped "extraConfig" Config object that is left to the notary service
itself to parse.
* Remove the raft bootstrapping command from node, we'll need a different
mechanism for that.
* Remove pre-generated identity config value.
* Split up obtainIdentity() in AbstractNode to make it easier to read.
* A temporary workaround for the bootstrapper tool to support BFT notaries.
* Update docs
* Add upgrade notes
* Fix rebase issue
* Add a config diff for the bft notary as well
2018-10-22 10:26:10 +01:00
e56d84fd5d
Merge OS -> ENT
2018-10-21 21:57:37 +01:00
dd60ae27f2
FungibleState and design document for tokens ( #4049 )
2018-10-20 10:52:24 +01:00
7b230de4d2
ENT-2492 - Test and document configuration for 'shareable' datacenter-wide Zookeeper deployment ( #1429 )
...
* zookeeper doc
* explicitly mention hot/hot is not supported
* change zookeeper to ZooKeeper
* change doc link to v3.5.3
* add note stating only zookeeper v3.5.3-beta is compatible
2018-10-02 13:22:38 +01:00
acd3f44181
Merge remote-tracking branch 'open/master'
2018-08-23 13:55:11 +01:00
d2ef16cbfd
Deterministic JVM ( #3386 )
...
* CID-251 - Deterministic JVM
* CID-251 - Add DJVM documentation
* CID-251 - Address review comments from @chrisr3
* CID-251 - Address further review comments from @chrisr3
* CID-251 - Use shadowJar to generate fat JAR
* CID-251 - Address review comments from @exFalso
* CID-251 - Improve naming in ReferenceMap
* CID-251 - Add test for Kotlin meta-class behaviour
* CID-251 - Address review comments from @shamsasari
* CID-251 - Add description of high-level flow
* CID-251 - Refactoring
* CID-251 - Rename package to net.corda.djvm
* CID-251 - Include deterministic-rt.jar as runtime dependency
* CID-251 - Add Gradle task for generating whitelist from deterministic rt.jar
* CID-251 - Error messages for StackOverflow/OutOfMemory, update whitelist
* CID-251 - Reduce set definition of pinned classes
* CID-251 - Tidy up logic around pinned classes
* CID-251 - Shade ASM dependency and split out CLI tool
* CID-251 - Address review comments from @mikehearn (part 1)
* CID-251 - Address review comments from @mikehearn (part 2)
* CID-251 - Address review comments from @mikehearn (part 3)
* CID-251 - Address review comments from @exFalso
* CID-251 - Address review comments from @mikehearn (part 4)
* CID-251 - Address review comments from @exFalso and @mikehearn
* CID-251 - Address review comments from @mikehearn (part 5)
2018-08-22 16:01:39 +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
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
0c0d9b7906
Azure template guide ( #1282 )
...
* Azure template guide and testnet docs update
2018-07-20 16:29:10 +01:00
e5d82cc9b4
Na testnet explorer docs ( #3660 )
...
* added doc on testing deployment with node explorer
2018-07-20 16:21:24 +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
aa50aaf95d
Merge commit 'e879de7' into chrisr3-os-merge
2018-07-17 22:47:24 +01:00
8a54badc6a
CORDA-1514 Add our patented nested Merkle trees protocol to documentation
2018-07-17 15:36:10 +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
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
baabf8ceb9
Merge remote-tracking branch 'open-source/master' into thomas/os-merge-2018-07-11
...
Conflicts:
finance/src/integration-test/kotlin/net/corda/finance/flows/CashConfigDataFlowTest.kt
node/src/integration-test/kotlin/net/corda/node/BootTests.kt
node/src/integration-test/kotlin/net/corda/node/NodeUnloadHandlerTests.kt
node/src/integration-test/kotlin/net/corda/node/flows/FlowRetryTest.kt
tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-07-11 14:56:03 +01:00
017ffab60b
Testnet documentation pages ( #3287 )
...
* added doc page for running Corda on GCP vis Explore
* Fix bash code examples
* add images
* add images
* more typos fixed
* typo
* fix firewall commands
* more screenshots
* add screenshots for new projewct
* scale images
* screenshot
* added screenshot
* Bold steps
* more screenshots
* added screenshots
* upload screenshots
* added screenshots
* add contents
* add azure file
* add azure file
* updated azure screenshots
* updated azure screenshots
* more screenshots and text
* Updated run commands
* Updated run commands
* Update azure-vm-explore.rst
* Fix urls
* add AWS setup for explore
* aws screenshots
* update test for AWS
* aws screenshots
* aws screenshots
* add screenshots
* AWS updates
* AWS
* aws screenshot
* aws screenshots
* aws images
* aws updates
* aws updates
* aws screenshot
* Updated intro to new branding
* Added resoure group docs to azure page
* Updated azure screenshots
* Updated azure screenshots
* Updated azure screenshots
* Updated azure screenshots
* Updated aws docs
* Updated GCP docs
* Updated GCP docs
* Adding a Testnet overview page
* Adding a Testnet overview page
* Adding a Testnet overview page
* Adding a Testnet overview page
* Adding a Testnet overview page
* Adding a Testnet overview page
* Adding elastic IP to AWS
* Adding elastic IP to AWS
* Adding elastic IP to AWS
* updated dl link
* Update aws-vm-explore.rst
* update dl link
* Update gcp-vm.rst
* Fixing changes requested by RGB.
* Fixed link
* Additional changes requested in review.
* Updated based on RGB review comments.
* Minor formatting
* minor formatting
* Address review comments
* Address the review comments from RGB
* typo
* typo
* typo
* typo
* make underlines same length as headers
* Fix review comments
* Fix review comments
* fix review comments
* adding to index
2018-07-11 14:12:52 +01:00
123a2af5e0
Bridge to Firewall renames
...
More renaming
Update diagrams
Update changelog to point out breaking change fo the rename
Address Richard's PR comments
2018-07-05 15:20:28 +01:00
9b3044186d
ENT-1860 Enterprise sizing guidelines ( #1193 )
2018-07-04 17:43:21 +01:00
0f98a1cbcd
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180702
...
# Conflicts:
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
2018-07-02 11:31:18 +01:00
5d78992038
Minor changes to text to more accurately reflect the current implementation. ( #3477 )
2018-07-02 10:26:33 +01:00
86b34b1227
Merge remote-tracking branch 'remotes/open/master' into merges/june-13-13-27
...
# Conflicts:
# docs/source/changelog.rst
# docs/source/index.rst
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
2018-06-13 13:36:31 +01:00
e2701e69d6
[CORDA-1612]: Fix truncated code snippets in docs PDF ( #3347 )
2018-06-13 09:43:16 +01:00
4882e2e089
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180605
2018-06-05 13:37:35 +01:00
086b9daa6e
Updates the setup instructions to be IntelliJ 2018 compatibile. ( #3299 )
2018-06-05 10:57:29 +01:00
9447398acb
Hot-cold operational guide fixes and improvements ( #884 )
...
* minor typos, improving the HA operational
* Hot-cold operational guide improvement(typos, styling, more specific settings)
* ENT-1959: address PR comments
* address pr comments
2018-05-30 14:12:47 +01:00
033a5798a1
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180525-1
...
# Conflicts:
# .idea/compiler.xml
# node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/DatabaseTransaction.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/transitions/DeliverSessionMessageTransition.kt
# node/src/main/resources/reference.conf
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
# settings.gradle
2018-05-25 14:19:15 +01:00
d13cca49ec
ENT-1959: add a default value for mutualExclusionConfiguration.machineName ( #877 )
...
* ENT-1959: add a default value for mutualExclusionConfiguration.machineName
* ENT-1959: update docs
* ENT-1959: update docs, remove machineName from default conf, add unit test
2018-05-25 11:13:53 +01:00
52eef5da5b
Replace timestamp with time-window ( #3211 )
2018-05-24 16:06:33 +01:00
e0bb00eebb
Bogdan hotcold operational guide ( #855 )
...
* ENT-1864: added docs for hot-cold deployment with AWS and Azure
* rename docs resource image
* reworded hot-cold deployment guide, added section on mutual exclusion,
removed old high-availability guide
* ENT-1864: Addressed PR comments
* ENT-1864: Addressed PR comments
* ENT-1864: Addressed PR comments
* ENT-1864: Addressed PR comments
* ENT-1864: Addressed PR comments
* ENT-1864: Addressed PR comments
2018-05-24 11:42:02 +01:00
93245ac07d
Set the confirmationWindowSize setting in the bridge Artemis link. To reduce spam logging and improve performance.
...
Fixup doc pictures to match CRL config change
2018-05-21 09:52:04 +01:00
a5a860c52e
First pass doc on the bridge.conf configuration file.
...
More doc work on bridge
Fixup docs with regard to HA changes discovered during testing
Link to bridge docs and add note about Zookeeper prerequisite.
Doc in progress
Add operating modes to overview doc
Change to BridgeInner from FloatInner
Add diagram to worked configuration section
Fix some typos and comments from PR reviews
Try to tidy up some of the wording.
Add new config properties and change to subsection headers for mode discussion
2018-05-17 08:52:49 +01:00
266b96f99c
Merge commit '88c12791a81a49bdaab93e6bda4d070d7bf1ac5c' into aslemmer-merge-88c12791a81a49bdaab93e6bda4d070d7bf1ac5c
2018-04-26 10:01:30 +01:00
8ce05e0ae3
Updates diagram to correctly show chain-walking process.
2018-04-25 12:54:57 +01:00
36cd34bff5
Merge remote-tracking branch 'remotes/open/master' into merges/march-1-15-20
...
# Conflicts:
# docs/source/corda-configuration-file.rst
# docs/source/release-notes.rst
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt
# tools/explorer/README.md
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
2018-03-01 15:36:40 +00:00
754b87d547
Update identity docs ( #2319 )
...
* Update certificate extension specification
* Extend documentation on node name requirements
* Moving node naming back to node generation file. Merging other permissioning information.
* Update certificate structure image
2018-02-28 18:04:08 +00:00
eb3798da5e
Merge remote-tracking branch 'open/master' into colljos-merge-160118
2018-01-16 12:13:49 +00:00
29b52f66dc
Updates the documentation on versioning.
2018-01-12 10:20:24 +00:00
e9fc6f7c8d
Merge remote-tracking branch 'open/master' into colljos-os-merge-rc01
2017-12-18 10:24:38 +00:00
5b33db93fc
Add doc comments on supported TLS schemes and scheme hash functions ( #2161 )
2017-12-14 12:30:07 +00:00
8a6e9c52f3
Merge remote-tracking branch 'open-hc01/master' into colljos-os-hc01-merge-111217
2017-12-11 09:21:52 +00:00
0129bbe071
Minor corrections to the V2 cheatsheet.
2017-12-08 17:00:31 +00:00
6c02c91ec7
Removes old network diagram. Consolidates two sections on node naming. Moves contract constraints to API section.
2017-12-08 17:00:08 +00:00
4762569200
CORDA-822 - JMX Jolokia instrumentation ( #2197 )
...
* JMX Jolokia instrumentation WIP (driverDSL, webserver, cordformation, hibernate statistics, access policy config file hardening)
* Cordformation changes to support jolokia agent instrumentation at JVM startup.
* Minor updates to reflect usage of Jolokia 1.3.7 (which uses slightly different .war naming)
* Use relative path reference in -javaagent to prevent problem with long path names with spaces.
* Fixed incorrect regex pattern and added assertion to test.
* Enable JMX monitoring.
* Reporting of Hibernate JMX statistics is configurable (by default, only switched on in devMode)
* Make Artemis JMX enablement configurable.
* Re-instate banning of java serialization.
* Improve JUnit.
* Fixes following rebase from master.
* Re-instated correct regex for picking up Jolokia agent jar.
* Fixed broken integration test.
* Updated documentation
* Updated following PR review feedback.
* Fixed compilation error caused by change in DriverDSL argument type.
* Fixed compilation error caused by change in DriverDSL argument type.
* Fail fast if jolokia-agent-jvm.jar is not located.
* Applied changes in cordformation following review feedback from CA.
2017-12-08 16:27:12 +00:00
c5e17d90f2
Adding HSM signing service docs ( #122 )
...
* Adding HSM signing service docs
* Addressing review comments
* Addressing review comments - round 2
* Addressing review comments - round 3
* Fixing method comment
2017-11-24 11:32:12 +00:00
85071f227a
Reflects tutorial changes and CorDapp build docs changes from release-V1.
2017-11-16 15:31:52 +00:00
