Commit Graph

7493 Commits

Author SHA1 Message Date
601b2faf5f Incorporate comments from PR 2016-07-28 16:22:35 +01:00
87bc02d2a8 all tests now pass - but some are commented out 2016-07-28 16:00:19 +01:00
e3f36a4942 Modified tests for new DSL 2016-07-28 15:57:09 +01:00
92e05f07aa Initial checkin for Trade Finance work into experimental module 2016-07-28 15:48:40 +01:00
ac0d0ec0ec Initial checkin for Trade Finance work into experimental branch 2016-07-28 15:47:55 +01:00
c57f265cce Fixup plugins to include static content property after rebase inclusive of that work 2016-07-28 13:55:06 +01:00
10f68b22f9 Minor fix after rebase 2016-07-28 13:39:16 +01:00
235497e0f4 Convert long lived services supporting protocol listeners to plugins 2016-07-28 13:39:12 +01:00
454f555728 Merged in mnesbit-cor-261-artemis-over-ssl (pull request #247)
Create MessageServiceInternal interface to allow NetworkMapCache to register addresses with the network service.
2016-07-28 13:35:44 +01:00
09c795e341 Merge remote-tracking branch 'remotes/origin/master' into mnesbit-cor-261-artemis-over-ssl 2016-07-28 13:28:31 +01:00
5410f8b228 Merged in demowebui (pull request #230)
Added an IRS demo web interface
2016-07-28 13:19:32 +01:00
ec726da7d0 Merged in rnicoll-warnings (pull request #246)
Correct warnings
2016-07-28 13:03:55 +01:00
bcbac345e8 Fixed display issue when using double digit months and days. 2016-07-28 11:37:10 +01:00
7d5ee8ba08 Create MessageServiceInternal interface to allow NetworkMapCache to register addresses with the network service.
Activate WhitelistTrustManager for now to secure the TLS messaging.
2016-07-28 11:25:57 +01:00
7e6c1332e7 Regen docsite 2016-07-28 12:20:11 +02:00
f4e8537cf0 Fixed documentation. 2016-07-28 09:26:47 +01:00
5167ed7df2 Merged in mike-fix-irs (pull request #244)
Fix how the IRS contract uses fix commands
2016-07-28 10:19:16 +02:00
aebdc86225 Reverted change from previous commit. 2016-07-28 09:17:49 +01:00
188fc29436 Cleaned up build.gradle files. 2016-07-28 09:17:49 +01:00
ffc3c8f421 Added Jacoco code coverage to gradle. 2016-07-28 09:17:49 +01:00
2a0066ae74 Merged in rnicoll-wallet-notify-transaction (pull request #237)
Add wallet service for notifying remote nodes of transactions
2016-07-27 17:45:21 +01:00
d54beca77e Add wallet service for notifying remote nodes of transactions 2016-07-27 17:40:52 +01:00
aaaf6ea4f6 Correct warnings 2016-07-27 17:11:46 +01:00
510fa34053 Merged in mnesbit-cor-261-artemis-over-ssl (pull request #238)
Add X509 creation and manipulation utilities to core and enable SSL in ArtemisMQ
2016-07-27 15:59:52 +01:00
5a20b67ce2 Clean up comments 2016-07-27 15:45:32 +01:00
e3aef96b09 Merge remote-tracking branch 'remotes/origin/master' into mnesbit-cor-261-artemis-over-ssl
# Conflicts:
#	build.gradle
2016-07-27 15:43:01 +01:00
8bdeda63ae Merged in rnicoll-checkpoint-generic (pull request #241)
Rework checkpoint storage to include the FiberRequest
2016-07-27 15:20:40 +01:00
e8c84867cf Merged in andrius-logging (pull request #240)
Enable logging to file
2016-07-27 14:18:24 +01:00
1a9cdf992f Fix an issue in the IRS contract where it was expecting two different kinds of fix command simultaneously for apparently no good reason. The unit tests didn't spot that because the unit test wasn't actually verifying the constructed transactions: fix that too.
Uncovered during the tx types refactoring work.
2016-07-27 14:38:21 +02:00
62e91000e9 Minor: some minor tweaks to IRSUtils types 2016-07-27 14:37:32 +02:00
889b74ca9b Minor: apply some inspector and reformatting cleanups to IRS.kt 2016-07-27 11:17:00 +02:00
772ce28a81 remove extra space 2016-07-26 15:42:11 +01:00
9a9df847af Merge remote-tracking branch 'remotes/origin/master' into mnesbit-cor-261-artemis-over-ssl 2016-07-26 15:25:58 +01:00
fea452d9ac Change to a ConcurrentHashSet whitelist so that we don't hold any locks across the DNS lookup. 2016-07-26 14:40:30 +01:00
73d2346d35 Merged in clint-alltestfix (pull request #235)
All Tests can now be run on Windows as tests are now forked by class.
2016-07-26 12:17:07 +01:00
1c49eb5123 Merged in clint-protocolchange (pull request #243)
Removed reference from progress tracker output to improve output readability.
2016-07-26 12:16:26 +01:00
e81d8b9928 Removed reference from progress tracker output to improve output readability. 2016-07-26 10:43:41 +01:00
250dbaa45d Renamed notional amount to notional. 2016-07-26 10:40:42 +01:00
4c4484b820 Merge remote-tracking branch 'origin/mnesbit-cor-261-artemis-over-ssl' into mnesbit-cor-261-artemis-over-ssl
# Conflicts:
#	core/src/main/kotlin/com/r3corda/core/crypto/WhitelistTrustManager.kt
2016-07-26 10:36:42 +01:00
cb8876678e Address comments from code review. Also, make whitelist registration synchronized. 2016-07-26 10:35:59 +01:00
ed52f2b35d An implementation of a Security Provider that replaces the default TrustManager with one that checks certificate names against a manually controlled white list. This isn't activated anywhere yet, but the network map should register the valid node dns names. 2016-07-26 10:35:58 +01:00
e5777fd999 Fetch KeyStore passwords from NodeConfiguration 2016-07-26 10:35:57 +01:00
4c08141ce3 Tidy up based upon comments on PR 2016-07-26 10:35:56 +01:00
c7bc5ae652 Correct usage of hostName and cannonicalHostName in certificates to ensure the SSL certificates validate on Linux 2016-07-26 10:35:55 +01:00
00f897d58d Add X509 creation and manipulation utilities to core and enable SSL in ArtemisMQ 2016-07-26 10:35:54 +01:00
f807e157b6 Appended hostname to log filename. Logging date in ISO8601, GMT 2016-07-25 18:07:50 +01:00
38f4711a80 Merged in mnesbit-sprint-5-tidyup (pull request #229)
Refactor APIServer to use the same whitelist controlled protocol gateway as the scheduler.
2016-07-25 17:58:27 +01:00
d5ca4590d8 Improved styling. 2016-07-25 17:32:33 +01:00
fd441d5e3e An implementation of a Security Provider that replaces the default TrustManager with one that checks certificate names against a manually controlled white list. This isn't activated anywhere yet, but the network map should register the valid node dns names. 2016-07-25 16:47:28 +01:00
c08d53d030 Merge remote-tracking branch 'origin/mnesbit-sprint-5-tidyup' into mnesbit-sprint-5-tidyup
# Conflicts:
#	node/src/main/kotlin/com/r3corda/node/internal/APIServerImpl.kt
2016-07-25 16:37:38 +01:00