c9616cb15e
[CORDA-1148] Include all of the vararg methods in our public API.
2018-03-05 23:02:05 +00:00
76447b0298
Merge pull request #508 from corda/chrisr3-merge-os
...
O/S merge up to ef703c50
2018-03-05 13:50:55 +00:00
04610b8545
Merge remote-tracking branch 'public/master' into chrisr3-merge-os
...
O/S merge up to ef703c50
2018-03-05 12:27:49 +00:00
ef703c50be
Configure buildSrc to be multi-module. ( #2658 )
...
* Configure buildSrc to be multi-module.
* Declare canonicalizer plugin's descriptor via build.gradle.
2018-03-05 12:07:36 +00:00
4a73a80b39
CORDA-1160: Only read node-info files if their last modified time has changed. ( #2717 )
2018-03-05 11:10:38 +00:00
e19f9a3841
CORDA-1122 Tweak Artemis for performance ( #496 )
...
* ENT-1434 - tweak Artemis for P2P to auto commit and send asynchronously.
* ENT-1434 - tweak Artemis for P2P to auto commit and send asynchronously.
* Fix test compilation
2018-03-05 10:47:45 +00:00
7c459f3c99
Merge pull request #445 from corda/aslemmer-fix-added-sm-event
...
Only emit SM Add events when the flow signals that it started
2018-03-05 10:45:10 +00:00
26fe90c8e9
CORDA-973 Allow deserialization of any checkpoint/storage encoding. ( #2693 )
2018-03-05 10:11:26 +00:00
91fd46f2c0
Updates text of running node shel.
2018-03-02 17:48:45 +00:00
08decac922
CORDA-1144 Fix documentation that refers to IRS demo code ( #2711 )
2018-03-02 15:36:54 +00:00
27d59de9fa
Merge pull request #503 from corda/mike-merge-80c00b920b
...
O/S Merge to 80c00b920b
2018-03-02 16:15:29 +01:00
abc281056f
Merge remote-tracking branch 'open/master' into mike-merge-80c00b920b
2018-03-02 15:17:32 +01:00
80c00b920b
Fix another non-serializable exception, add docs, fix a possible security issue. ( #2707 )
...
* Fix another non-serializable exception, add docs, fix a possible security issue.
* Update API definition to reflect methods added to make more exceptions serializable
2018-03-02 15:10:54 +01:00
799d90b350
CORDA-1134 - Don't use private serializes for all caps public properties ( #2692 )
...
* CORDA-1134 - Don't use private serializes for all caps public properties
* Small fix
* Review Comments
2018-03-02 13:21:27 +00:00
06a6eace67
CORDA-1115 - Cannot serialize private nested objects ( #2665 )
...
* CORDA-1115 - Cannot serialize private nested objects
Shown up by the simm-valuation-demo the problem was where a private
object field of an object was being serialised within the outer objects
context (see tests added for example)
Fix is to switch from Kotlin reflection back to Java.
Additional fix to the test where it was comparing two lists of state
references in a flow and they weren't equal because they weren't in the
same order... This I assume is just an oversight (in that them being
in a different order but otherwise the same is actually fine) so
converting to set comparison
* Fix forward port issue where fingerprinting has moved
* Review Comments
* Review Comments
* Review Comments
* Gran -> Grab
2018-03-02 13:13:00 +00:00
41bdad5aa2
Makes it clear that monitoring must be turned on.
2018-03-02 12:49:44 +00:00
021b677b7d
Renaming DAO for the CSR ( #500 )
2018-03-02 12:15:46 +00:00
965035a92e
Merge pull request #501 from corda/os-merge-020318
...
O/S merge 020318
2018-03-02 11:54:41 +00:00
8f05dc2230
Renaming configuration sections for doorman and network map ( #472 )
2018-03-02 11:41:00 +00:00
617838c108
Removes output that is no longer logged.
2018-03-02 11:20:29 +00:00
7d3b585a9c
RELEASE: Bump platform version past V3 ( #2701 )
2018-03-02 11:18:24 +00:00
a59083ceb2
Merge remote-tracking branch 'open/master' into os-merge-020318
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
2018-03-02 10:42:03 +00:00
29215035e1
Merge pull request #498 from corda/merges/march-1-15-20
...
merges/CORDA-926_march-1-15_20
2018-03-02 10:17:12 +00:00
5e5cb1888b
Made strict behaviour optional default to true for conf parsing. HSM and Doorman can opt in for this functionality independently.
2018-03-02 09:19:47 +00:00
2d16647498
Refactoring modifiedBy and status fields for the certificate signing … ( #475 )
...
* Refactoring modifiedBy and status fields for the certificate signing request entity
* Fixing migration
2018-03-02 08:50:38 +00:00
f9bfebe4a8
[CORDA-1136] Update startup message of P2P address and port ( #2698 )
2018-03-02 08:50:31 +00:00
8616f24523
CORDA-1048: Making it simpler to move an existing local deployment of nodes to across different machines. ( #2672 )
...
This was achieved by having the hash in the node-info file to be just of the node's X.500 name. This also solves existing duplicate node-info file issues that we've been having.
Also updated the docsite.
2018-03-01 21:24:10 +00:00
38208d9e44
Made strict behaviour optional default to true for conf parsing. HSM and Doorman can opt in for this functionality independently.
2018-03-01 18:08:22 +00:00
14cafee66e
Fix the serialisability of TransactionVerificationException and subtypes. ( #2689 )
...
Add KDocs for the exceptions in this file, and deprecate exceptions that aren't actually used.
2018-03-01 19:03:54 +01:00
b39a1a71d9
Backported removed release notes entry.
2018-03-01 17:41:35 +00:00
06af213cdb
CORDA-1050 docs on whitelisting CorDapps ( #2671 )
...
* CORDA-1050 docs on whitelisting CorDapps
* Addressed code review notes
* Addressed code review notes
2018-03-01 17:37:33 +00:00
26a11bccc9
CORDA-1004 Use FastThreadLocalThread in multi-thread SMM. ( #492 )
2018-03-01 17:35:41 +00:00
8239c5d29f
Add network-management version info on startup ( #497 )
...
* Add network-management version info on startup
Add version info to manifest file and print it out on network-managemnet
startup
2018-03-01 17:09:59 +00:00
4f92a2584b
Backported removed release notes entry.
2018-03-01 16:53:51 +00:00
c38dccacca
Changed system and environmental variables to only be parsed as config if they're prefixed with "corda." e.g., to override "p2pPort" would now take a "corda.p2pPort" from system or environmental variables.
2018-03-01 16:37:15 +00: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
08c5b72874
1076 - Filters out structural steps when tracking a flow via RPC.
2018-03-01 15:08:07 +00:00
b580a2ac30
[CORDA-926]: Parsing NodeConfiguration will now fail if unknown properties are present. ( #2484 )
2018-03-01 14:57:36 +00:00
351469b765
Merge pull request #495 from corda/anthony-os-merge-2
...
Anthony OS merge
2018-02-28 18:04:23 +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
f5ffdab927
Merge pull request #2673 from corda/merge/CORDA-1127
...
CORDA-1127 - updated comments to follow current port layout (#2669 )
2018-02-28 17:55:00 +00:00
97a2a5e497
Update api current
2018-02-28 17:21:56 +00:00
9dc5ce2161
Apply new test api to enterprise tests
2018-02-28 17:07:49 +00:00
c72b3ad4fa
Merge remote-tracking branch 'open/master' into anthony-os-merge-2
...
# Conflicts:
# .ci/api-current.txt
# client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/FlowsExecutionModeRpcTest.kt
# docs/source/example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/mocknetwork/TutorialMockNetwork.kt
# finance/src/test/kotlin/net/corda/finance/flows/CashPaymentFlowTests.kt
# node/src/integration-test/kotlin/net/corda/node/CordappScanningDriverTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/LargeTransactionsTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/modes/draining/ScheduledFlowsDrainingModeTest.kt
# node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/test/kotlin/net/corda/node/services/statemachine/FlowFrameworkTests.kt
# node/src/test/kotlin/net/corda/node/services/transactions/MaxTransactionSizeTests.kt
# samples/trader-demo/src/integration-test/kotlin/net/corda/traderdemo/TraderDemoTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
2018-02-28 16:55:15 +00:00
493c66670d
Merge pull request #493 from corda/andr3ej-os-merge
...
Merge my conflicting OS changes
2018-02-28 16:17:21 +00:00
8565fbd47f
CORDA-1127 - updated comments to follow current port layout ( #2669 )
2018-02-28 16:48:40 +01:00
90e8621324
Make the test pass.
2018-02-28 15:14:39 +00:00
b578b934f7
Merge commit '4d4253a287c6ddccddeab8ed24f9e16da5e25bc2' into andr3ej-os-merge
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
2018-02-28 14:39:29 +00:00
0f2077364e
Fix merge conflicts.
2018-02-28 14:12:54 +00:00
577033441a
[CORDA-1035] Testing api KDoc Updates ( #2584 )
...
* Testing api KDoc Updates
* Update after code review
* Update api-current
* Revert changes to compiler.xml
* Made comment changes from review
* Fixing merge conflict
* Don't expose net.corda.node through test API (first pass)
* Fixing merge conflicts
* Update api-current
* Addressing review commits
* Fix exposure of internal implementation of MessageHandlerRegistration
* Make InProcess expose ServiceHub instead of internal StartedNodeServices
* Move InternalMockMessaginService interface to internal namespace
* Move MOCK_VERSION_INFO to internal namespace to avoid exposing VersionInfo
* Don't expose WritableTransactionStorage via testing api
* Create public VerifierType enum
* Update api-current and modify check-api-changes to check for net.corda.node exposures
* Fix merge conflicts
* Fixing another merge conflict
* Fix accidentally broken unit tests
* Make getInternalServices a property
* Fix failing unit tests
* Add todo to check-api-changes
* Fix rpc sender thread busy looping
* Fix tests
* Fixing tests
* Address mike's comments
* Fixing tests
* Make random port allocation internal
* Update api
2018-02-28 13:26:49 +00:00
