Commit Graph

8095 Commits

Author SHA1 Message Date
Clinton Alexander
8414c97a61 Moved JsonSupport to new webserver module. Fixed a few compile errors.
Fixed compile issues caused by webserver being split to a separate project.
WebServer now starts and stops correctly as a separate module.
2017-02-27 16:41:48 +00:00
Clinton Alexander
bc9f86905c Added webserver module. Moved webserver files to the webserver module. 2017-02-27 16:15:27 +00:00
Andras Slemmer
85243a6b76 Merge pull request #291 from corda/aslemmer-loadtest-fixes
Aslemmer loadtest fixes
2017-02-27 14:15:10 +00:00
Andras Slemmer
8522d79371 core: Add ServicesForResolution interface 2017-02-27 14:03:25 +00:00
Clinton
2d265596d7 Merge pull request #270 from corda/clint-runnodesnames
Modified title of the webserver on systems using xterm to run nodes.
2017-02-27 12:54:56 +00:00
Andras Slemmer
986bd548fa loadtest: Fix config loading, add missing fields 2017-02-27 11:38:44 +00:00
Andras Slemmer
298c45c314 loadtest: Fix various issues, update for pre-testnet 2017-02-27 11:36:01 +00:00
Andras Slemmer
1532318ae7 client: Fix wrong pickN generator 2017-02-27 11:36:01 +00:00
Patrick Kuo
f0d82e4918 Non-ssl artemis acceptor for RPC connection. (#271)
* New non-ssl acceptor in artemis server for RPC connection.
2017-02-24 15:36:36 +00:00
Clinton
ce2da918c8 Merge pull request #283 from gary-rowe/master
Add Hong Kong to list of cities in lookup table
2017-02-24 15:25:48 +00:00
Clinton Alexander
bfa50e802f Removed redundant gradle.properties in samples projects. 2017-02-24 13:04:43 +00:00
Chris Rankin
438fc97881 Merged in demobench (pull request #16)
Demobench

Approved-by: Clinton Alexander
Approved-by: Shams Asari
2017-02-24 09:43:10 +00:00
Chris Rankin
c8ee88a2fb Replace companion object with a BiPredicate lambda. 2017-02-24 09:07:13 +00:00
Gary Rowe
16a7298ef5 Fix incorrect whitespace character (required copy paste of tab) 2017-02-23 20:44:23 +00:00
Chris Rankin
ec9ecc88cc Another simple code review tweak. 2017-02-23 18:15:58 +00:00
Chris Rankin
34797c2735 More code review tweaks. 2017-02-23 17:42:19 +00:00
Gary Rowe
544f2de75e Add Hong Kong to list of cities in lookup table 2017-02-23 16:54:19 +00:00
Chris Rankin
d5872f4e5b Merge pull request #272 from corda/get-cash-balances
Implement RPCOp getCashBalances().
2017-02-23 16:33:35 +00:00
Chris Rankin
2664a2905c Code review tweaks. 2017-02-23 15:56:40 +00:00
Chris Rankin
396fc43f11 Fixes from code review. 2017-02-23 15:47:46 +00:00
Qian Hong
5e3c874ebf Minor: Fix typo in ValidatingNotaryService comment. 2017-02-23 12:08:44 +01:00
Andrius Dagys
2b3200207a Node refactoring: move building advertised services before SMM initialisation - the node doesn't need to maintain a reference to a uniqueness provider anymore.
Extract parts of start() into separate methods.
2017-02-23 10:45:38 +00:00
Chris Rankin
a2bf7d4d84 Break textfield definitions out into separate functions. 2017-02-23 10:39:31 +00:00
Chris Rankin
5a13d0355d CORPRIV-661: Ensure that nodes loaded from a profile have the correct network map service. 2017-02-22 17:04:42 +00:00
Chris Rankin
963d015c4d Fixes from code review. 2017-02-22 16:30:25 +00:00
Chris Rankin
dd0d7a0cf4 Merge branch 'master' into demobench 2017-02-22 14:02:30 +00:00
Chris Rankin
221278197a Implement RPCOp getCashBalances(). 2017-02-22 13:57:15 +00:00
Mike Hearn
8b1864e07c Minor: naming and doc tweaks in Merkle tree code. 2017-02-22 14:16:04 +01:00
Mike Hearn
b8942a2cc9 Remove the SignedTransaction.id field, which took part in serialisation. Calculate it on demand instead. 2017-02-22 14:16:04 +01:00
Mike Hearn
0b33b52d1a Minor: add a warning suppression over an unchecked cast in the upgrade code. 2017-02-22 14:16:04 +01:00
Mike Hearn
036b2597d3 Fix a bug in ContractUpgradeFlowTest where it wasn't actually checking both nodes. 2017-02-22 14:16:04 +01:00
Chris Rankin
d41fa782e0 Merge branch 'get-cash-balances' into demobench 2017-02-22 12:19:49 +00:00
Chris Rankin
63cebb3c96 Merged in get-cash-balances (pull request #21)
CORPRIV-687: Implement new RPCOp getCashBalances().

* CORPRIV-687: Implement new RPCOp getCashBalances().

* Use proper assertTrue().

Approved-by: Shams Asari
2017-02-22 12:17:35 +00:00
Chris Rankin
5d81064b4a Use proper assertTrue(). 2017-02-22 12:14:19 +00:00
Clinton Alexander
5516093a59 Modified title of the webserver on systems using xterm to run nodes. 2017-02-22 11:51:05 +00:00
Chris Rankin
fbd4f0bc6a CORPRIV-687: Refactor RPCOp getCashBalances() into separate branch. 2017-02-22 11:48:26 +00:00
Chris Rankin
0832ea405e CORPRIV-687: Implement new RPCOp getCashBalances(). 2017-02-22 11:27:48 +00:00
Andrius Dagys
006faa82a1 Make notary flow return a collection of signatures to support the BFT… (#264)
Make notary flow return a collection of signatures to support the BFT notary. For a single-node or RAFT notary it would just contain a single signature.
2017-02-22 11:11:35 +00:00
Clinton Alexander
9a2963bca9 Docs regen. 2017-02-22 10:59:02 +00:00
Clinton Alexander
91a72bb345 Updated docs to M8.2 2017-02-22 10:52:47 +00:00
Chris Rankin
6ad81ca1e7 Test transmission of an actual cash balance via RPC. 2017-02-22 10:51:46 +00:00
Chris Rankin
1a78ca240a Comment file copying vs file filtering during packaging. 2017-02-22 08:45:35 +00:00
Chris Rankin
2f82b58c9e CORPRIV-659: Renaming packaging script. 2017-02-22 08:45:11 +00:00
Chris Rankin
f6deeff9ae CORPRIV-658: Rename packaging script. 2017-02-22 08:44:38 +00:00
Shams Asari
c7abbe8791 Converting groovy GStrings to normal strings for ConfigValueFactory 2017-02-21 20:15:06 +00:00
Chris Rankin
9b2b3a31a0 Comment how JediTerm is not available via Maven. 2017-02-21 17:45:45 +00:00
Chris Rankin
f20cb1e74d Downgrade JDK requirement to 8u102, for consistency with capsules. 2017-02-21 16:43:58 +00:00
Chris Rankin
02a9e32d3c CORPRIV-659: Better validation for JAVA_HOME. 2017-02-21 16:32:30 +00:00
Chris Rankin
22d2244ce7 CORPRIV-659: Fix DMG installer. 2017-02-21 15:38:22 +00:00
Shams Asari
7181b697a3 extraAdvertisedServiceIds config is now a list of strings, rather than a comma separated string 2017-02-21 15:21:37 +00:00