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
b7d48b2f1a
Merge pull request #2667 from corda/tlil/CORDA-1103/fix-irs-windows
...
CORDA-1102 / CORDA-1103 - Fix IRS Demo on Windows
2018-02-28 12:52:21 +00:00
a542c0185d
CORDA-1103 - Fix JAR paths in IRS demo launcher
2018-02-28 11:39:31 +00:00
1e478b5164
Merge pull request #468 from corda/mkit-adding-logging-desc-to-readme
...
Documenting log level setting when starting doorman
2018-02-28 10:57:03 +00:00
3572ce05fa
CORDA-1102 - Fix IRS demo README
2018-02-28 10:03:15 +00:00
2e76cb1715
Merge pull request #491 from corda/andr3ej-typo-merge
...
Merge conflicting change from OS
2018-02-27 18:12:33 +00:00
e3086122a8
Merge commit '3abe6888cfd867b7edd398a2f8e80b1d470c7936' into andr3ej-typo-merge
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
2018-02-27 17:14:20 +00:00
4d4253a287
CORDA-1124 Fix thread leak in generateAndSaveNodeInfo ( #2659 )
2018-02-27 15:43:41 +00:00
0ff37c0437
CORDA-1122 Switch AMQP bridge to use auto-commit sends and acks ( #2661 )
...
* CORDA-1122 Switch AMQP bridge to use auto-commit sends and acks
* CORDA-1122 Codereview: Add comment for extra commit to rollback and add better message sequence logging to tricky test
2018-02-27 15:25:58 +00:00
4695cb0810
Allows DemoBench profile files to utilize extra database settings ( #2310 )
...
Pass-through for supporting external DB properites in .profile files
2018-02-27 15:15:46 +00:00
40727f3bdd
Update documentation of Postgres support
2018-02-27 14:44:17 +00:00
ce4392ef31
CORDA-1080 - Doc update to make instructions clearer ( #2599 )
2018-02-27 14:09:45 +00:00
0c62c6d850
Improves CorDapp build instructions by including other ext versions, and clearly pointing to the templates as a guide.
2018-02-27 12:48:08 +00:00
3abe6888cf
Fix typo. ( #2657 )
2018-02-27 12:36:44 +00:00
c7e03633c7
Merge remote-tracking branch 'open-source/master' into thomas-merge
2018-02-27 12:01:49 +00:00
48da1c3ebf
Merge pull request #2653 from corda/aslemmer-fix-rpc-server-sender
...
Fix rpc sender thread busy looping
2018-02-27 11:49:21 +00:00
854a40d87f
[Corda-1116] Classpath as env ( #2652 )
...
* Move classpath to a system variable so it can overcome command limits on Windows, while keep working fine on other system.
2018-02-27 11:48:25 +00:00
3066926f0f
Improved classloader closing ( #2650 )
...
* Better handling of classloader closing
2018-02-27 11:15:23 +00:00
cd569577d2
Fix rpc sender thread busy looping
2018-02-27 10:23:48 +00:00
3391810101
CORDA-1004 Quasar-friendly ThreadLocal solution ( #2594 )
...
* Use FastThreadLocalThread in fiber scheduler
* Test that thread locals aren't serialized
2018-02-27 10:22:30 +00:00
f7c9f0d10e
Wrong file name.
2018-02-27 10:21:03 +00:00
147f46fbf4
[CORDA-1119] Sign in DB transaction ( #2645 )
2018-02-27 10:00:30 +00:00
0adc203d7a
CORDA-696: Fix conflict resolution error, fix filename type
2018-02-27 09:48:39 +00:00
d425a10c2b
Merge pull request #486 from corda/andrius-merge-02-26
...
Merge CORDA-1096, CORDA-696, CORDA-877
2018-02-27 09:22:16 +00:00
59a6ced423
CORDA-696: Fix incorrect merge conflict resolution, fix filename typo
2018-02-26 18:48:20 +00:00
9814ea6f34
Merge branch 'master' into andrius-merge-02-26
2018-02-26 18:41:20 +00:00
3c8db47b5a
Updates shell example of starting flow to reflect cash API change.
2018-02-26 18:16:25 +00:00
9da3a8ee05
[ENT-1552] Delete temporary truststore once the test is complete. ( #484 ) ( #2634 )
2018-02-26 17:11:10 +00:00
f1c3f584ac
Showcase link in Quickstart guide. Remove Utilities link (merged with Samples).
2018-02-26 16:47:53 +00:00
2da28c574e
CORDA-1040 docs for FlowLogic.sleep ( #2625 )
2018-02-26 16:07:40 +00:00
b91ef43e0f
Remove the debug helper which should never make it into master ( #2633 )
...
* Remove IRS Docker demo helpers
2018-02-26 15:47:04 +00:00
cc84b34dca
Close classloader to release associated file ( #2635 )
...
[CORDA-1113] Close classloader to release associated file
2018-02-26 15:01:57 +00:00
7517270dde
Improves node.conf page. Shows the defaults used.
2018-02-26 14:53:13 +00:00
26c388003c
[ENT-1552] Delete temporary truststore once the test is complete. ( #484 )
2018-02-26 12:46:47 +00:00
60c44a0358
CORDA-998 Add suspend and resume functionality to Node ( #461 )
...
* Add suspend and resume functionality to Node to stop minimum number of services(P2PMessaging, RPCMessaging, NodeScheduler, StateMachine and BridgeManager)
2018-02-26 11:56:02 +00:00
cc8e38922e
Merge remote-tracking branch 'open/master' into andrius-merge-02-26
2018-02-26 11:55:17 +00:00
