Commit Graph

2190 Commits

Author SHA1 Message Date
7607244557 [CORDA-1841]: Made paths in tutorial-cordapp consistent. (#3778) 2018-08-13 16:21:16 +01:00
9bbc85db61 Miscellaneous doc fixes (#3760)
* 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.

* ENT-2302: Hello World Tutorial Page mismatch between code sample and explanatory text

Updated text to proper method

* ENT-2305: Java Instructions to Invoke Hello World CordApp fail

Removed Java instructions
2018-08-10 12:28:59 +01:00
b72d4295ba Fixes formatting. (#1326)
* Fixes formatting.

* Fixes backticks.
2018-08-10 11:27:35 +01:00
528164c173 Revert "ENT-2305: Java Instructions to Invoke Hello World CordApp fail"
This reverts commit 70346c45b3.
2018-08-09 12:26:54 +01:00
c8872eac6a Revert "ENT-2302: Hello World Tutorial Page mismatch between code sample and explanatory text"
This reverts commit ed088562f6.
2018-08-09 12:24:00 +01:00
fef494ea9c Revert "ENT-2298: CE Hello World Tutorial Page references Corda V1.0"
This reverts commit 403407a919.
2018-08-09 12:11:31 +01:00
892215e27f Clarification in upgrade docs. (#3759)
* Clarification in upgrade docs.

* Address review comments.
2018-08-09 11:46:14 +01:00
e508033201 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180809-1 2018-08-09 09:33:38 +01:00
5f17fc1b07 Jmx Reporter Addition to allow for New Relic over Jolokia alternative (#3739)
* gradle.build - Added metrics-new-relic dependency
Node.kt - Refactored start(): NodeInfo function extracting the code that was creating the Jolokia JMX reporter configuration and placing it into its own registerJolokiaReporter private function, added a registerJmxReporter function that is now called from start(), the registerJxmReporter function checks the NodeConfiguration's JmxReporterType value for either JOLOKIA or NEW_RELIC to derive whether to execute the registerJolokiaReporter vs. registerNewRelic reporter.
NodeConfiguration - enhanced to encapsulate a JmxReporterType (JOLOKIA is the default config) configuration options for Jolokia or NewRelic reporters.
Enhanced NodeTest.kt, NodeConfigurationImpleTest.kt and added test-working-config-newrelic.conf to ensure that tests still work as expected.

* Added configuration details concerning JmxReporterType ...

* Updated files with style suggestions made by @tlil

* Updated markdown of the external url

* Changed grammer on "See `Introduction to New Relic for Java`_ for details on getting started and how to install the New Relic Java Agent."
to "See `Introduction to New Relic for Java`_ for details on how to get started and how to install the New Relic Java agent."
2018-08-09 08:11:17 +01:00
f987651fe4 Clarifies type of hash used to hash CorDapp JARs (#3756) 2018-08-08 15:47:45 +01:00
f5989013f2 OS->Ent merge 2018-08-06 14:43:51 +01:00
c24d916f5a RPC changes (#3697)
* Eliminate un-necessary reference to Kryo in the comment

* RPC documentation update.

* Rename RpcClientObservableSerializer into RpcClientObservableDeSerializer
2018-08-06 09:11:15 +01:00
286dc7b77d Joel upgrade docs (#3730)
* Instructions on how to perform H2 DB upgrades without starting the node.

* Formatting error. Adds required subsections in H2 docs.

* Merges duplicated information about H2 DB access.

* Drops script references for now.

* Clarifies upgrade notes.

* Better title.

* Inr

* Addresses review comments.

* Addresses review comments.
2018-08-03 13:34:34 +01:00
53ce630889 Document minimal administration rights for databases - related to ENT-2243 (#1312) 2018-08-03 10:30:35 +01:00
49d99f00fc Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180802-1 2018-08-02 10:34:34 +01:00
2e03c7f8c0 Clarifies Gradle wrapper usage. Clarifies one module = one CorDapp. (#3721)
* Clarifies Gradle wrapper usage. Clarifies one module = one CorDapp.

* Clean-up. Note on how to create nodes and CorDapps in prod.

* Fixes based on rendering.

* Addresses review comments.
2018-08-01 17:55:00 +01:00
a63c9526ca Merge OS 2018-08-01 14:13:39 +01:00
c23167f08e ENT-2188 fix H2 insecure default configuration (#3692)
Set the "h2.allowedClasses" system property, require database password when exposing H2 server on non-localhost address, samples start H2 server by default (reintroduces the behaviour before h2Settings.address configuration option was added)
2018-08-01 11:50:42 +01:00
0762a61aca In AbstractNode check if an initiating flow already has a flow registered to it and throw exception if one has been (#3713)
* In AbstractNode check if an initiating flow already has a flow registered to it and throw exception if one has been

In AbstractNode.internalRegisterFlowFactory check if a flow factory already exists for a initiating flow
If a factory does exist, throw an exception
A few tests needed to be fixed due to this change

* Reorder test setup to prevent flows from being registered multiple times

* Use check instead of if and throws statement in AbstractNode when checking for initiating flow having multiple flows mapped to it

Use check instead of if throws statement
Change names of methods in tests
Improve FlowRegistrationTest to better check if flow has been registered properly

* tidy up FlowFrameworkTests and FlowRegistrationTest
2018-08-01 07:58:00 +01:00
159a3d25a5 Merge remote-tracking branch 'open/master' into tudor-os-merge-31-07
# Conflicts:
#	finance/src/test/kotlin/net/corda/finance/contracts/CommercialPaperTests.kt
#	finance/src/test/kotlin/net/corda/finance/contracts/asset/CashTests.kt
#	finance/src/test/kotlin/net/corda/finance/flows/CashIssueFlowTests.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
#	node/src/test/kotlin/net/corda/node/services/schema/PersistentStateServiceTests.kt
#	node/src/test/kotlin/net/corda/node/services/vault/VaultWithCashTest.kt
2018-07-31 17:53:43 +01:00
8b501b1b80 CORDA-1858 - Vault query fails to find a state if it extends from class (#3722)
* Included Contract State parent classes in list of queryable types.

* Added changelog entry.
2018-07-31 17:16:27 +01:00
dfafdbcb9f Added checks against the use of the special uploader tokens (#3724)
"app", "rpc", "p2p" and "unknown" have security implications (see isUploaderTrusted method) and thus they are not allowed to be used in the uploader field when importing attachments via the public API.
2018-07-31 17:01:39 +01:00
994fe0dbdc CORDA-1845: Check for min plaform version of 4 when building transactions with reference states (#3705)
Also includes some minor cleanup brought up in a previous PR.
2018-07-31 16:07:35 +01:00
d42b9f51ac Miner change to mention notary node dosen't need web server, and also change the total terminal windows number from 8 to 5 (#3012)
* There is a duplication of the kotlin introduce part, which is the same as the description of the "Note" section right below. So remove this duplicated part but keep the "Note".

* A miner change about the build node folder structure, first is Notary node doesn't need one web server, second is in V3.0, there are 5 windows totally but not 8.

* Miner updates for the format of changes, as instructed by Joel on https://github.com/corda/corda/pull/3012
2018-07-31 15:36:25 +01:00
f04e73352d Merge branch 'os-merge-point' into os-merge-93bb24e
# Conflicts:
#	CONTRIBUTORS.md
#	node/build.gradle
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/test/kotlin/net/corda/node/messaging/InMemoryMessagingTests.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt
2018-07-31 14:52:53 +01:00
85caa9ee9d Feature/corda 1847/remove hibernate observers (#3696)
* CORDA-1847 Fix hibernate observer issue

* CORDA-1847 Fix hibernate observer issue

* CORDA-1847 Fix hibernate observer issue

* CORDA-1847 Fix tests

* CORDA-1847 Fix tests

* CORDA-1847 Fix tests
2018-07-31 13:52:13 +01:00
4542e0cd06 CORDA-916: Add registerFlowFactory method to public test API (#3720)
* Add registerFlowFactory method to public test API

* Return CordaFuture rather than a plain Future

* Rename method

* Improve KDoc

* Hide internal interface with public wrapper

* Modify API current to include ResponderFlowFactory interface

* Take API definition change from generated file

* Note API change in changelog
2018-07-31 13:33:18 +01:00
6f47633f71 Merge pull request #1306 from corda/kat-merge-27072018
Kat merge 27072018
2018-07-30 13:19:38 +01:00
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