Commit Graph

1481 Commits

Author SHA1 Message Date
406cdf39bb Merge remote-tracking branch 'open/master' into kat-merge-20180508 2018-05-08 12:10:22 +01:00
b5e8dc5bd1 [CORDA-1338]: Error with VaultQuery for entity inheriting from CommonSchemaV1.FungibleState - FIX (#3025) 2018-05-04 22:37:56 +07:00
0784f079ed Revert "OS merge (#806)"
This reverts commit 5c0775f7b4.
2018-05-04 16:09:11 +01:00
d254bf6d46 ENT-1548: Improve docs for hsm (#805)
* Improve docs for hsm

Add information on different configs depending on which execution mode
for hsm is run

* Remove default config file argument for hsm, add required to cli flag.
2018-05-04 15:58:36 +01:00
5c0775f7b4 OS merge (#806) 2018-05-04 15:47:36 +01:00
100f680042 CORDA-1001 - Remove peristent map in NodeSchedulerService (#763) (#3076)
* CORDA-1001 - Remove peristent map in NodeSchedulerService (#763)

* Add scheduled flow test that uses multithreaded node

* Replace use of PersistentMap in NodeSchedulerService

* Correct class name and remove duplicate test

* Address initial PR comments

* Remove debugging code

* Remove acidentally added line

* Move Scheduled State contracts to internal module

* Put things in the right places

* Add changelog message

* Fix countdown issue

* Addressing PR comments

* Remove unused class
2018-05-04 15:04:52 +01:00
907031e840 [ENT-1825] Document details of cipher suites (#3073) 2018-05-04 14:34:45 +01:00
081b7251a7 CORDA-1001 - Remove peristent map in NodeSchedulerService (#763)
* Add scheduled flow test that uses multithreaded node

* Replace use of PersistentMap in NodeSchedulerService

* Correct class name and remove duplicate test

* Address initial PR comments

* Remove debugging code

* Remove acidentally added line

* Move Scheduled State contracts to internal module

* Put things in the right places

* Add changelog message

* Fix countdown issue

* Addressing PR comments
2018-05-04 11:35:01 +01:00
24839f25e2 Running Dockerform generated nodes (#3041) 2018-05-04 10:22:03 +01:00
a61aa5d645 CORDA-847 - Pass serialization context down serialization call stack (#3062)
* CORDA-847 - Pass serialization context down serialization call stack

Needed for later work on AMQP RPC where we need to set per-thread
elements on a context. Could use some magic thread local but I'd rather
it was explicit on the stack and thus easier to reason about.

Additionally, now we're passing this around we can make better use of it
in the future

* Test Fix

* Test fixes

* REVIEW COMMENTS / CODE FORMAT

* Fix build issues
2018-05-03 16:09:03 +01:00
db22c5259d Feature to exclude CorDapps from specific MockNodes in a MockNetwork. (#3028)
* Feature to exclude CorDapps from specific MockNode's in a MockNetwork.

* Fixed API stability issue.

* * Added docs.
* Changed approach for the new parameter to be additive as opposed to exclusive.

* * Updated incorrect comments.
2018-05-03 15:39:52 +01:00
855f89b61e Merge remote-tracking branch 'open/master' into andrius/os-merge 2018-05-03 13:37:39 +01:00
c044096260 Merge pull request #801 from corda/mkit-os-ent-merge
OS -> ENT Merge up to ab80df342a
2018-05-03 12:23:28 +01:00
2e1cee00f7 ENT-1608: Check that notary identities are registered (#799)
Check that notary identities are registered

On loading new parameteres check that provieded notary identities were
registered by doorman.
Refactor of NetworkParameters loading code in network-management.
2018-05-03 11:09:11 +01:00
e5e98f3540 Merge OS commit 'ab80df342ab8a7ede0539daaee9fcecd02f6aeeb' into enterprise 2018-05-03 10:55:40 +01:00
6b65ea06ac Link back to contributing.md. Instructions on updating docs. Tweaks. (#3064) 2018-05-03 10:31:22 +01:00
0d3c7e7762 CORDA-847 - RPC Server lib refactoring (#3056)
Just as we did for the RPC CLient, refactor kryo specific elements into
their own sub module. Also move kryo specific components out of generic
RPC files.

Thus, adding AMQP support will be a much smoother operation
2018-05-02 15:48:41 +01:00
3bf1e803d9 Move notary service related classes and interfaces in core to interna… (#2827)
* Move notary service related classes and interfaces in core to internal, since we won't be able to stabilise the APIs for writing custom notary services any time soon (the docs already mention it). I left out the wire protocol related classes so we don't accidentally break it.
2018-05-02 12:21:38 +01:00
514287e694 Fixed invalid page ref in upgrade-notes.rst (#3053) 2018-05-02 10:10:23 +01:00
e338414cd4 CORDA-847 - RPC Clent lib refactoring (#3052)
Move Kryo into it's own sub module
2018-05-01 20:52:19 +01:00
0c680ae530 CORDA-1403 - Generics serialization issue (#3030)
When implementing a generic interface subtype check fails, need
to compare to the actual raw type
2018-05-01 16:27:54 +01:00
92922b874c [CORDA-1397]: Fixed incorrect exception handling in NodeVaultService._query(). (#3043) 2018-05-01 19:33:13 +07:00
5565b3e80d [CORDA-1411]: Prevent MappedSchema caching from leaking memory. (#3042) 2018-05-01 19:32:29 +07:00
7bbae1c311 Fix docs 2018-04-30 18:08:35 +01:00
f25b0bd1c5 Add more documentation on private networks (#786)
Add more documentation on private networks
2018-04-30 16:01:53 +01:00
09a35f8e68 Splits node structure from node creation. Tweaks. (#3015) 2018-04-30 15:19:59 +01:00
79cbaf8adf Makes it clear that notaries are clusters or 1+ nodes. 2018-04-30 14:58:13 +01:00
beef7bdfba A typo fix.
Line 108
Was: We want to create an IOU of 100 with PartyB. We start the ``IOUFlow`` by typing:
Should be We want to create an IOU of 99 with PartyB. We start the ``IOUFlow`` by typing:
2018-04-30 13:54:14 +01:00
0a8043ccc4 CORDA-1261: Document bootstrapping cannot use the same H2 port (#3032) 2018-04-30 11:05:57 +01:00
32b57feaa0 Update jolokia to 1.5.0 (#2617)
* Update jolokia to 1.5.0

* adding jolokia update to changelog
2018-04-30 10:24:08 +01:00
ab80df342a CORDA-1319 Adding CRL checking for nodes (#2987)
* Adding CRL support for nodes

* Addressing review comments
2018-04-30 09:26:26 +01:00
70b32636b5 Merge remote-tracking branch 'remotes/open/master' into merges/april-27-09-38
# Conflicts:
#	docs/source/changelog.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
2018-04-27 10:12:15 +01:00
235df69efe [CORDA-1379]: Allow soft trapping of unknown config keys. (#3011) 2018-04-27 15:33:13 +07:00
cec2f25c67 ENT-1627 - Allow to set hibernate.dialect setting for pluggable database (#687)
Optional property `database.hibernateDialect` which maps to `hibernate.dialect`.
2018-04-26 19:05:55 +01:00
627708a63a Merge commit 'cde701ab10a04a25fca2e7c69d8b49e36f439f58' into kstreich-ENT-OS-merge 2018-04-26 16:30:47 +01:00
22d5967b9e Adds setting the PATH environment variable to the set-up instructions. 2018-04-26 15:50:17 +01:00
61d2212840 Merge remote-tracking branch 'open-source/master' into thomas-merge
experimental/behave/src/main/kotlin/net/corda/behave/logging/LogUtilities.kt
node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
2018-04-26 14:47:29 +01:00
cde701ab10 Add docs on private networks config and endpoint (#3006)
Add docs on private networks config and endpoint
2018-04-26 14:26:37 +01:00
2ff3939e2e Add exponential backoff to P2P messaging retry (#2975) 2018-04-26 13:58:41 +01:00
266b96f99c Merge commit '88c12791a81a49bdaab93e6bda4d070d7bf1ac5c' into aslemmer-merge-88c12791a81a49bdaab93e6bda4d070d7bf1ac5c 2018-04-26 10:01:30 +01:00
999048db48 Merge pull request #772 from corda/mike-merge-4cfb1606da
Merge to 4cfb1606da
2018-04-26 09:27:25 +02:00
8ce05e0ae3 Updates diagram to correctly show chain-walking process. 2018-04-25 12:54:57 +01:00
8883803111 Merge pull request #548 from corda/MarkOldfield-patch-1
Added design checklist
2018-04-25 11:31:55 +02:00
3e27a85fe1 Minor: mention that h2port is only useful for developer mode in enterprise 2018-04-25 10:49:23 +02:00
f99d16eebb Merge remote-tracking branch 'open/master' into mike-merge-4cfb1606da 2018-04-25 10:43:23 +02:00
4cfb1606da Minor: document the h2port option (#2988) 2018-04-25 10:38:59 +02:00
5f781193b6 Merge remote-tracking branch 'open/master' into os-merge-d3446e2
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/BootTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt
#	testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
#	tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeController.kt
2018-04-23 15:50:24 +01:00
d3446e213c Introduced a few more extension methods to Path, which are clearer than the static methods in Files. (#2985)
Also migrated code away from the old File API.
2018-04-23 14:31:49 +01:00
071be31916 Resolve merge conflicts 2018-04-23 14:27:32 +01:00
f1fd1cefd8 Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/corda-os-merge 2018-04-23 14:19:51 +01:00