Ross Nicoll
8bdeda63ae
Merged in rnicoll-checkpoint-generic (pull request #241 )
...
Rework checkpoint storage to include the FiberRequest
2016-07-27 15:20:40 +01:00
Andrius Dagys
e8c84867cf
Merged in andrius-logging (pull request #240 )
...
Enable logging to file
2016-07-27 14:18:24 +01:00
Mike Hearn
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
Mike Hearn
62e91000e9
Minor: some minor tweaks to IRSUtils types
2016-07-27 14:37:32 +02:00
Mike Hearn
889b74ca9b
Minor: apply some inspector and reformatting cleanups to IRS.kt
2016-07-27 11:17:00 +02:00
Matthew Nesbit
772ce28a81
remove extra space
2016-07-26 15:42:11 +01:00
Matthew Nesbit
9a9df847af
Merge remote-tracking branch 'remotes/origin/master' into mnesbit-cor-261-artemis-over-ssl
2016-07-26 15:25:58 +01:00
Matthew Nesbit
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
Clinton Alexander
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
Clinton Alexander
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
Clinton Alexander
e81d8b9928
Removed reference from progress tracker output to improve output readability.
2016-07-26 10:43:41 +01:00
Clinton Alexander
250dbaa45d
Renamed notional amount to notional.
2016-07-26 10:40:42 +01:00
Matthew Nesbit
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
Matthew Nesbit
cb8876678e
Address comments from code review. Also, make whitelist registration synchronized.
2016-07-26 10:35:59 +01:00
Matthew Nesbit
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
Matthew Nesbit
e5777fd999
Fetch KeyStore passwords from NodeConfiguration
2016-07-26 10:35:57 +01:00
Matthew Nesbit
4c08141ce3
Tidy up based upon comments on PR
2016-07-26 10:35:56 +01:00
Matthew Nesbit
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
Matthew Nesbit
00f897d58d
Add X509 creation and manipulation utilities to core and enable SSL in ArtemisMQ
2016-07-26 10:35:54 +01:00
Andrius Dagys
f807e157b6
Appended hostname to log filename. Logging date in ISO8601, GMT
2016-07-25 18:07:50 +01:00
Matthew Nesbit
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
Clinton Alexander
d5ca4590d8
Improved styling.
2016-07-25 17:32:33 +01:00
Matthew Nesbit
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
Matthew Nesbit
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
Matthew Nesbit
0d68523f5c
Validate protocol type and args via whitelist ahead of class loading. Also, push this work into another method on the Factory.
2016-07-25 16:35:45 +01:00
Matthew Nesbit
0542f7c509
Refactor APIServer to use the same whitelist controlled protocol gateway as the scheduler.
2016-07-25 13:46:40 +01:00
Clinton Alexander
77245bdc1a
Fixed a typo in the docs.
2016-07-25 11:55:23 +01:00
Clinton Alexander
6aabdc49eb
Removed rounded borders on top menu
2016-07-25 11:35:37 +01:00
Clinton Alexander
e7f4997b1b
Improved styling further on all pages.
2016-07-25 11:32:35 +01:00
Clinton Alexander
df5dcc34f6
Improved homepage theming.
2016-07-25 11:23:43 +01:00
Clinton Alexander
19e3f7f0cb
Updated documentation to use the new endpoints.
2016-07-25 10:53:38 +01:00
Clinton Alexander
67defe19cc
Small refactor of initWebServer to improve readability.
2016-07-25 10:36:37 +01:00
Clinton Alexander
fda2079611
Removed dead code.
2016-07-25 10:31:55 +01:00
Clinton Alexander
6505923a78
Merge branch 'demowebui' of https://bitbucket.org/R3-CEV/r3prototyping into demowebui
2016-07-25 10:30:49 +01:00
Clinton Alexander
93f4440c14
Moved IRS web folder up a level. Added support for static serving plugins.
2016-07-25 10:30:30 +01:00
Ross Nicoll
2f04d876ae
Move FiberRequest out to a top level class
...
Move FiberRequest out to a top level class, both because it is expanding as functionality is added,
and to enable alternative state machine implementations to share it.
2016-07-24 09:30:16 +01:00
Matthew Nesbit
83c89c3ec8
Fetch KeyStore passwords from NodeConfiguration
2016-07-22 18:07:27 +01:00
Matthew Nesbit
b042fac905
Tidy up based upon comments on PR
2016-07-22 18:07:26 +01:00
Matthew Nesbit
196fe57147
Correct usage of hostName and cannonicalHostName in certificates to ensure the SSL certificates validate on Linux
2016-07-22 18:07:25 +01:00
Matthew Nesbit
129eeca7de
Add X509 creation and manipulation utilities to core and enable SSL in ArtemisMQ
2016-07-22 18:07:24 +01:00
Andrius Dagys
e7ff5b8f6f
Typo fix
2016-07-22 17:31:03 +01:00
Ross Nicoll
31ee8ab60b
Rework checkpoint storage to include the FiberRequest
...
Rework checkpoint storage to include the FiberRequest, so that different requests can be supported.
2016-07-22 16:40:15 +01:00
Andrius Dagys
2142bd1d8a
Added Log4j bindings for SLF4J. Test log output is redirected to the console, and demo output is now additionally stored in a rolling log file.
2016-07-22 16:15:00 +01:00
Mike Hearn
119813a36d
Minor: document the SMM.changes observable.
2016-07-22 15:50:21 +02:00
Clinton Alexander
11afce9bbf
Review fixes.
2016-07-22 12:44:42 +01:00
Clinton Alexander
9375cd21c1
All Tests can now be run on Windows as tests are now forked by class.
2016-07-20 14:27:24 +01:00
Ross Nicoll
2c139ae40c
Merged in rnicoll-state-machine-id (pull request #234 )
...
Add Fiber ID to state machine change events
2016-07-20 13:23:02 +01:00
Ross Nicoll
f866c4689e
Merged in rnicoll-cash-generate-exit (pull request #233 )
...
Add Cash.generateExit() function
2016-07-20 13:21:29 +01:00
Ross Nicoll
f25e19ed5e
Add Cash.generateExit() function
2016-07-20 13:20:43 +01:00
Clinton Alexander
88f4317606
Removed dead links
2016-07-20 11:51:00 +01:00
