Merge commit '8cac69d2522ae37b2bb976347b5aad853c04795a' into mike-merge-413f476a3

This commit is contained in:
Mike Hearn 2018-05-15 18:09:16 +02:00
commit 12fa4741a6
16 changed files with 63 additions and 37 deletions

View File

@ -60,6 +60,7 @@ public class StandaloneCordaRPCJavaClientTest {
true,
Collections.singletonList(rpcUser),
true,
true,
Collections.emptyList()
);

View File

@ -1,9 +1,10 @@
## The following requirements were added by pip freeze:
alabaster==0.7.8
Babel==2.3.4
certifi==2018.4.16
chardet==3.0.4
CommonMark==0.5.5
docutils==0.12
future==0.16.0
idna==2.6
imagesize==0.7.1
Jinja2==2.8
@ -14,9 +15,10 @@ Pillow==5.1.0
Pygments==2.2.0
pyparsing==2.2.0
pytz==2016.4
recommonmark==0.4.0
reportlab==3.4.0
requests==2.18.4
rst2pdf==0.93
rst2pdf==0.93.dev0
six==1.10.0
snowballstemmer==1.2.1
Sphinx==1.7.4

View File

@ -24,6 +24,13 @@ input {
letter-spacing: 0.3px
}
p.caption {
margin-top: 2em;
}
span.caption-text {
font-size: larger;
}
p {
font-size: 100%; /* Get rid of RTD rule that assumes nobody changes their browser font size */
}

View File

@ -1,5 +1,5 @@
Building a Corda VM from the AWS Marketplace
============================================
AWS Marketplace
===============
To help you design, build and test applications on Corda, called CorDapps, a Corda network AMI can be deployed from the `AWS Marketplace <https://aws.amazon.com/marketplace/pp/B077PG9SP5>`__. Instructions on running Corda nodes can be found `here <https://docs.corda.net/deploying-a-node.html>`_.
@ -12,7 +12,7 @@ Pre-requisites
Deploying a Corda Network
---------------------------
-------------------------
Browse to the `AWS Marketplace <https://aws.amazon.com/marketplace>`__ and search for Corda.

View File

@ -1,5 +1,5 @@
Building a Corda Network on Azure Marketplace
=============================================
Azure Marketplace
=================
To help you design, build and test applications on Corda, called CorDapps, a Corda network can be deployed on the `Microsoft Azure Marketplace <https://azure.microsoft.com/en-gb/overview/what-is-azure>`_

View File

@ -41,8 +41,10 @@ templates_path = ['_templates']
# The suffix(es) of source filenames.
# You can specify multiple suffix as a list of string:
# source_suffix = ['.rst', '.md']
source_suffix = '.rst'
source_suffix = ['.rst', '.md']
source_parsers = {
'.md': 'recommonmark.parser.CommonMarkParser',
}
# The encoding of source files.
#source_encoding = 'utf-8-sig'

View File

@ -1,5 +1,5 @@
Corda networks
==============
Networks
========
.. toctree::
:maxdepth: 1

View File

@ -1,5 +1,5 @@
Corda nodes
===========
Nodes
=====
.. toctree::
:maxdepth: 1

View File

@ -10,7 +10,7 @@ These should be written in [Markdown](https://github.com/adam-p/markdown-here/wi
## Design Review Process
Please see the [design review process](./designReviewProcess.md).
Please see the [design review process](design-review-process.md).
* Feature request submission
* High level design

View File

@ -1,9 +1,8 @@
# Overview
# Design review process
The Corda Design Review process defines a means of editing, storing, collaborating, reviewing and approving Corda documentation in a consistent, structured, easily accessible and open manner.
# Background
## Background
Historically, Corda design documentation has been produced in an ad hoc fashion to include:
* Multiple sources and formats of storage
@ -20,7 +19,7 @@ Historically, Corda design documentation has been produced in an ad hoc fashion
* Lack of proposed implementation plan (time, resources, effort).
* Often missing stakeholder collaboration and review in the feedback cycle.
# Process
## Process
This process specifies:
@ -53,7 +52,8 @@ The following diagram illustrates the process flow:
![Design Review Process](./designReviewProcess.png)
# Review Groups
## Review Groups
Design documents should include all relevant stakeholders in their distribution (mostly as PR reviewers in github). This will often vary and depend on the origin of the Feature Request, particularly for high level business requirements. Technical Design Documents will tend to include a small set of stakeholders (Design Approval Board, Platform Development, DevOps). Final approval authority lays with at least one member of the Design Approval Board (DAB) or nominated delegate(s).
Design Approval Board (DAB)
@ -91,7 +91,7 @@ Other review groups inlcude:
* Customers
* Key collaborators
# Applicability and Timing
## Applicability and Timing
This process should be applied to any major feature request gathered by the product management team or lead technologists that has been entered in the product backlog as a requirement, and has been prioritized for imminent execution.

View File

@ -2,7 +2,7 @@
# Design Template
Please read the [Design Review Process](../designReviewProcess.md) before completing a design.
Please read the [Design Review Process](../design-review-process.md) before completing a design.
This design template should be used for capturing new Corda feature requests that have been raised as JIRA requirements stories by the product management team. The design may be completed in two stages depending on the complexity and scope of the new feature.

View File

@ -30,18 +30,40 @@ We look forward to seeing what you can do with Corda!
.. _`download the PDF`: _static/corda-developer-site.pdf
.. toctree::
:caption: Development
:maxdepth: 1
quickstart-index.rst
key-concepts.rst
operations-guide.rst
building-a-cordapp-index.rst
corda-nodes-index.rst
corda-networks-index.rst
tutorials-index.rst
tools-index.rst
node-internals-index.rst
component-library-index.rst
release-process-index.rst
troubleshooting.rst
other-index.rst
.. toctree::
:caption: Operations
:maxdepth: 2
corda-nodes-index.rst
corda-networks-index.rst
azure-vm.rst
aws-vm.rst
loadtesting.rst
.. toctree::
:caption: Design docs
:maxdepth: 2
design/design-review-process.md
.. toctree::
:caption: Participate
:maxdepth: 2
release-process-index.rst
corda-repo-layout.rst
building-the-docs.rst
json.rst

View File

@ -1,9 +0,0 @@
Other
=====
.. toctree::
:maxdepth: 1
corda-repo-layout
building-the-docs
json

View File

@ -7,6 +7,3 @@ Tools
network-simulator
demobench
node-explorer
azure-vm
aws-vm
loadtesting

View File

@ -91,6 +91,8 @@ class RpcExceptionHandlingProxy(private val delegate: SecureCordaRPCOps) : Corda
override fun acceptNewNetworkParameters(parametersHash: SecureHash) = wrap { delegate.acceptNewNetworkParameters(parametersHash) }
override fun killFlow(id: StateMachineRunId) = wrap { delegate.killFlow(id) }
override fun nodeInfo() = wrap(delegate::nodeInfo)
override fun notaryIdentities() = wrap(delegate::notaryIdentities)

View File

@ -26,6 +26,7 @@ class NodeConfig(
val rpcAdminPort: Int,
val isNotary: Boolean,
val users: List<User>,
val devMode: Boolean = true,
val runMigration: Boolean = true,
val jarDirs: List<String> = emptyList()
) {
@ -52,6 +53,7 @@ class NodeConfig(
.withValue("database", valueFor(mapOf("runMigration" to runMigration)))
.withValue("useTestClock", valueFor(true))
.withValue("jarDirs", valueFor(jarDirs))
.withValue("devMode", valueFor(devMode))
return if (isNotary) {
config.withValue("notary", ConfigValueFactory.fromMap(mapOf("validating" to true)))
} else {