Commit Graph

11045 Commits

Author SHA1 Message Date
4ac2c59623 Adds links to referenced code files. 2018-02-01 18:34:44 +00:00
eb99a7d775 Refresh API/ABI definition file (#2449) 2018-02-01 17:26:54 +01:00
258b562e16 set network registration poll interval via http cache control header (#434) (#2445)
* set network registration poll interval via http cache control header from the server side

* default poll interval to 10 seconds if cache header not found

* address PR issues

* address PR issues

(cherry picked from commit dca8699)
2018-02-01 15:18:53 +00:00
92cf91c0b0 Merge pull request #159 from corda/aslemmer-multi-threaded-sm
Multi-threaded SMM
2018-02-01 14:24:17 +00:00
794a7b0d51 30 seconds timeout on notary health check 2018-02-01 13:48:01 +00:00
1b2d7b3f1f Update notary health check tool to test each replica individually 2018-02-01 13:48:01 +00:00
e1edce18f0 Refactor NotaryFlow.Client so it's easier to override its behaviour 2018-02-01 13:48:01 +00:00
dca8699e7c set network registration poll interval via http cache control header (#434)
* set network registration poll interval via http cache control header from the server side

* default poll interval to 10 seconds if cache header not found

* address PR issues

* address PR issues
2018-02-01 13:38:25 +00:00
00b90a98fb CORDA-943 - Cope with multiple generics at str->type conversion in AMQP
Also fixes an odd bug where the inferred type of a getter wasn't
matching the constructor parameter type because that was still unbounded
and seen as T, looking at the raw type allows us to inspect this
properly
2018-02-01 12:19:32 +00:00
0c93f1d4b1 Remove exposure of internal hibernate configuration from mockservices (#2442) 2018-02-01 10:31:11 +00:00
641cecaf70 Mkit cp ent 1458 fixing hardcoded sign interval (#437)
* Fixing hardcoded sign interval config

* Addressing review comments
2018-02-01 07:37:26 +00:00
781d517761 Added documentation and extra logging to publish tasks (#2427)
Added documentation and extra logging to publish tasks
2018-01-31 20:56:25 +00:00
409cdf05e0 Added option to enable docs only builds if a specific file is present (#2441)
Added option to enable docs only builds if a specific file is present
2018-01-31 20:46:31 +00:00
182d594574 Put back AutoOfferFlow 2018-01-31 18:24:02 +00:00
b71f0c49fb Multi threaded state machine 2018-01-31 18:13:25 +00:00
941429d3a7 Remove word restriction in corda x500 name (#2439)
* Remove word restriction in x500 name https://github.com/corda/corda/issues/2326

* remove unused const

* address PR issue

* address PR issue

* address PR issue
pre-release-V3-branchpoint
2018-01-31 17:05:52 +00:00
222c5b9db8 CORDA-943 - Fix trader demo
This is a multi issue problem
1. Fingerprinting of generics treats <T> and <?> differently, forcing
the evolver to be used when not needed

2. However, the evolver is required sometimes as generics are not
guaranteed to fingerprinting bi-directionally (thanks to type erasure of
deeply nested generic types). However, with serialization now writing
properties in a specific order, we need to ensure they're read back in
that order before applying them to an evolved constructor so as to
not corrupt the object reference cache
2018-01-31 14:58:00 +00:00
2edf632f7f Merge pull request #428 from corda/mnesbit-merge-20180131
Merge up bridging code move from OS
2018-01-31 14:50:34 +00:00
88a6e59906 Mkit cp fix network map serialization issue (#430)
* Fixing serialization issue for the network map signer

* Addressing review comments

* Adding more assertions to the network map test

* Changing assertTrue to assertThat
2018-01-31 14:36:27 +00:00
9f8536d010 Add 'Regulator' schema name to setup of database integration test of IRSDemoTest. (#427) 2018-01-31 12:32:51 +00:00
7f58afc7ca Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180131 2018-01-31 10:37:44 +00:00
4d78d51663 Merge pull request #424 from corda/pat/os-enterprise-merge
os to enterprise merge
2018-01-30 18:21:55 +00:00
ceff50d656 Refactor location of bridge code to allow out of process bridging (#2431)
Fix some issues Andras has seen
2018-01-30 16:29:59 +00:00
2d557d04b4 Minor rewrites. Better documentation of granting RPC permissions to RPC users. 2018-01-30 16:06:20 +00:00
970303dc2d fix broken test after merge 2018-01-30 14:23:24 +00:00
1c77736d50 merge os to enterprise 2018-01-30 14:00:22 +00:00
d6f9721cb8 Docs: move serialisation into the CorDapp section. Fix some markup issues (#2429)
* Docs: move serialisation into the CorDapp section. Fix some markup issues.

* Address review comments
2018-01-30 10:59:03 +01:00
1ecf646f7e Oracle 11xe and 12c database compatibility (#206)
* Sql setup scripts for Oracle and datasource configuration.
* CashSelection for Oracle.
* Workaround of forbidden distinct for BLOBs.
* ojdbc8.jar driver dependency from Oracle Maven repository, ojdbc6.jar from lib (it's not in Maven repo).
* allow to use random Port in node names and trim it from schema name, remove schema with port numbers from db setup (to cater for new test, non Oracle specific change) 
* Removed unnecessary code from ConfigUtilities (non Oracle specific change) 
* Removed db integration tests setup for RPCStabilityTest as it doesn't start any nodes
2018-01-29 18:35:58 +00:00
da5d0ab806 Add trace logging to network map service (#410)
* add trace logging on network map incoming request

* address PR issue, added trace logging for get end points
2018-01-29 17:44:43 +00:00
685ab4c9b0 Add trace logging to network map client (#2424)
* Add trace logging to network map client

* Add trace logging to network map client

* address PR issue

* address PR issue
2018-01-29 17:44:28 +00:00
28e29c0873 Fix path issue which causes windows build failure. (#2430) 2018-01-29 17:43:48 +00:00
9ca63d173d Update OWASP dependency checker to latest working version 2018-01-29 18:36:51 +01:00
93054a9590 Add cmdline option for network root truststore and password (#2407)
* add cmdline option for network root truststore and password, instead of using node's truststore configuration to avoid confusion.

* revert line auto format

* fix failing integration test

* address PR issue
2018-01-29 13:43:16 +00:00
2432b1380e Clean up of network-management to make more use of the existing X509 utilities (#419) 2018-01-29 12:49:58 +00:00
4851d9ca6a Documents rationale for using cordapp, cordaRuntime and cordaCompile Gradle configs. 2018-01-29 12:42:31 +00:00
3d32760dcc ENT-1331: Updating High Level design following discussion with Mike, Jose and David H 2018-01-29 12:06:47 +00:00
37e207eaf3 Merge pull request #2271 from corda/aslemmer-fix-irsdemo
Fix non-visible IRS demo bug
2018-01-29 11:03:08 +00:00
be2ae80b55 Fix up some JMeter defaults, and allow non-anonymous cash payments from the sampler (#413)
* Fix up JMeter jmx files.

* Add anon identity flag

(cherry picked from commit f897b1a)

* Add anon identity flag (fixed)

(cherry picked from commit b43f135)
2018-01-29 10:59:22 +00:00
8f0457866f Merge pull request #418 from corda/mnesbit-merge-20180126
Merge up from OS including bridge control protocol
2018-01-29 09:22:43 +00:00
e19f51d9ac CORDA-959 Filter unschedules and remove database activity from inside mutex. (#2426)
* Filter unschedules and remove database activity from inside mutex.

* Race condition fix

* Bug fix
2018-01-26 17:44:42 +00:00
054c44d4bc Merge from OS to ENT including Bridge manager work 2018-01-26 16:55:43 +00:00
4257891c98 Revert "Raft Notary: remove snapshotting" (#2423)
This reverts commit cf33be66ff.
2018-01-26 16:23:59 +00:00
e8f8ff7c94 Revert "Removed gradle plugins from repo to ensure plugins are never changed in R3 corda"
This reverts commit c91d9b5507.
2018-01-26 16:06:46 +00:00
c91d9b5507 Removed gradle plugins from repo to ensure plugins are never changed in R3 corda 2018-01-26 16:03:10 +00:00
d3cd2f92a4 Merge pull request #412 from corda/shams-os-merge-250118
O/S merge 250118
2018-01-26 15:30:57 +00:00
fca3d565ac Add 'Regulator' node for AutoOfferFlow, fixing IRS 2018-01-26 14:29:35 +00:00
881379b889 Merge branch 'master' into shams-os-merge-250118 2018-01-26 13:45:21 +00:00
336aeb96e5 Merge fixes 2018-01-26 13:45:03 +00:00
58f76ee2da Put IRS spring whatever back on classpath 2018-01-26 11:21:38 +00:00
e357a88181 Deprecate TimeWindowChecker, make TimeWindowInvalid report exact current time and transaction time window (#2280)
* Make notary service return the current time and the transaction time window
along with the TimeWindowInvalid error.

Deprecate TimeWindowChecker.
Add a static method for validating transaction time window to reduce code duplication.
2018-01-26 09:32:11 +00:00