11724 Commits

Author SHA1 Message Date
Chris Rankin
8d6c54e2d5 Merge commit '781b50642aec9deeeadee219318509e050f9026e' into chrisr3-os-merge 2018-05-09 13:50:46 +01:00
Chris Rankin
781b50642a
ENT-1463: Prepare node-api for determination. (#3080)
* Prepare node-api for determination.
* Disentangle Kryo and AMQP classes.
* Add version properties for fast-classpath-scanner, proton-j and snappy.
* Remove String.jvm extension function.
* Refactor Cordapp reference out of AMQP serialisers' primary constructors.
2018-05-09 13:37:04 +01:00
Thomas Schroeter
750e368283
[ENT-1859] Handle issue transactions with time window (#809) 2018-05-09 13:12:33 +01:00
Patrick Kuo
be11da76c8
CORDA-1363 Network registration helper should check public key in certificate before storing in keystore (#3071)
* check pub key in network registration helper before storing in DB
2018-05-09 12:56:10 +01:00
Katelyn Baker
8517f51d49
Merge pull request #810 from corda/kat-merge-20180508
Kat merge 20180508
2018-05-09 12:09:33 +01:00
Tudor Malene
a70e479696
ENT-1762 doc around jarDirs (#3094)
* ENT-1762 doc around jarDirs
2018-05-09 11:16:36 +01:00
Katelyn Baker
96ab22f1da Merge remote-tracking branch 'open/master' into kat-merge-20180508 2018-05-09 11:00:07 +01:00
Michele Sollecito
d7ef385cc7
[CORDA-1395] [CORDA-1378]: Control the max number of transaction dependencies. (#3047) 2018-05-09 15:58:18 +07:00
Chris Rankin
dc66c961cb
Add missing @Deprecated annotations to fix API Stability check. (#3091) 2018-05-08 18:06:47 +01:00
szymonsztuka
a792a2c13f
Add db schema setup in database mode for the integration test introduced by CORDA-1001. (#811) 2018-05-08 17:19:25 +01:00
Tudor Malene
5b26fd6551
CORDA-1346 split the simm valuation demo to reduce the size of the contract jar (#3078) 2018-05-08 16:19:35 +01:00
Michele Sollecito
1963c29f01
Merge branch 'master' into kat-merge-20180508 2018-05-08 21:52:24 +07:00
sollecitom
c0e7e5cff4 Fixed tests broken by incorrect package name. 2018-05-08 15:48:59 +01:00
josecoll
28644b6514
Merge pull request #751 from corda/colljos-compatibility-testing
ENT-1834: Corda Behave extensions for CTS
2018-05-08 15:42:11 +01:00
Maksymilian Pawlak
91f013c127
Flow framework test optimisation (#3031)
* Flow framework test separation into classes, so the one which do not require nodes restart can execute faster.
2018-05-08 14:00:57 +01:00
josecoll
0072d41958 Fixed incorrect references to (renamed) feature files. 2018-05-08 14:00:47 +01:00
Katelyn Baker
51d6a937f7 Revert "OS -> ENT merge - Update apicurrent with deprecated methods"
This reverts commit 8561b05f9901f5b397c6665ed4e0636244e9fe89.
2018-05-08 13:57:09 +01:00
Katelyn Baker
13ed556b22 Merge branch 'kat-merge-20180508' of github.com:corda/enterprise into kat-merge-20180508 2018-05-08 13:41:07 +01:00
Katelyn Baker
8561b05f99 OS -> ENT merge - Update apicurrent with deprecated methods 2018-05-08 13:40:38 +01:00
Michele Sollecito
5318c395ee
[CORDA-860]: Retrieving state by recordTime.max() throws a cast exception (fixed) (#3090) 2018-05-08 19:16:19 +07:00
Maksymilian Pawlak
2a247cd229 Refactoring of VaultQuery tests to accomodate changes from OS 2018-05-08 12:54:25 +01:00
Katelyn Baker
406cdf39bb Merge remote-tracking branch 'open/master' into kat-merge-20180508 2018-05-08 12:10:22 +01:00
Joel Dudley
173d0f2ada
Updates ports to match new CorDapp example ports. (#3088) 2018-05-08 11:44:33 +01:00
szymonsztuka
c2c23c482e
ENT-1822 Cash selection db vendor lookup too restrictive (#800)
Cash selection implementation is chosen by matching the beginning of the JDBC driver name, not the entire driver name (effectively it's up to each implementation).
2018-05-08 11:26:18 +01:00
josecoll
493b8a99a0
Added missing dependency on finance cordapp. (#3059) 2018-05-08 11:20:30 +01:00
Joel Dudley
7ac7e9911e
Adds mailing list and Twitter links. Removes Discourse link. (#3081) 2018-05-07 12:09:21 +01:00
Andrius Dagys
e2ae04b11c
ENT-1410: MySQL notary service - process requests in batches (#758)
* ENT-1410: MySQL notary service - process requests in batches
2018-05-04 18:36:07 +01:00
Matthew Nesbit
ea2f9c1ef8
Merge pull request #804 from corda/mnesbit-prune-bridge-dependencies
ENT-1847: Slim down bridge capsule jar
2018-05-04 16:40:59 +01:00
Michele Sollecito
b5e8dc5bd1
[CORDA-1338]: Error with VaultQuery for entity inheriting from CommonSchemaV1.FungibleState - FIX (#3025) 2018-05-04 22:37:56 +07:00
Mike Hearn
327f3383f9 Revert "TEST FIX"
This reverts commit 57b617c7d9d8ed12ac1090d9f993e751bc60527b.
2018-05-04 16:14:23 +01:00
Mike Hearn
0784f079ed Revert "OS merge (#806)"
This reverts commit 5c0775f7b41561792c2590f6abee4e2d95e430dc.
2018-05-04 16:09:11 +01:00
Katarzyna Streich
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
cburlinchon
5c0775f7b4
OS merge (#806) 2018-05-04 15:47:36 +01:00
Anthony Keenan
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
Katarzyna Streich
e564303869
CORDA-1414: node should continue with parameters from file when network map not available (#3061)
Fix CORDA-1414

If network map is not available or returns exception on network
parameters reading, node should continue with parameters from file.
2018-05-04 14:42:10 +01:00
Konstantinos Chalkias
907031e840
[ENT-1825] Document details of cipher suites (#3073) 2018-05-04 14:34:45 +01:00
Matthew Nesbit
1ae4c20b10 Slim down bridge capsule jar
Add bridge smoke-test to :bridge:bridgecapsule to verify that all the dependencies are correctly packaged and present.

Correct proton-j version

Correct proton-j version
2018-05-04 14:07:26 +01:00
Anthony Keenan
f8a4368310
Add node scheduler db tests inside use block (#3075) 2018-05-04 13:03:02 +01:00
Kat Baker
57b617c7d9 TEST FIX 2018-05-04 12:36:45 +01:00
Anthony Keenan
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
Maksymilian Pawlak
24839f25e2
Running Dockerform generated nodes (#3041) 2018-05-04 10:22:03 +01:00
Maksymilian Pawlak
2cec6b095c
Vault query refactor (#3065)
* Move test initialization logic to jUnit rules for better composition and reusability
2018-05-04 10:21:40 +01:00
Joel Dudley
0f15c89ee0
Update contributors list. (#3074) 2018-05-04 09:21:53 +01:00
Richard Gendal Brown
3e65ab1a7e Expanded message to contributors (#2969)
* Revised and expanded contribution guidelines

* Added some extra links and reordered

* Reworded substantially following Dave Hudson's feedback. Incorporated James's feedback too

* fixed urls

* capital letter after colons if they are the start of a new sentence

* Named Joel as a maintainer

* Linked to docsite mechanics page

* simplified some of the wording

* Said R3 Alliance the first time R3 is mentioned and clarified that R3 implies R3 Alliance

* merged the two "how to contribute" sections
2018-05-04 09:18:36 +01:00
Andrius Dagys
253de5dc75
Merge pull request #803 from corda/andrius/os-merge
OS merge
2018-05-04 08:50:55 +01:00
Shams Asari
a772884d48
CORDA-1030 - allow nodes to be waited for in-process (#2678) (#3070)
(cherry picked from commit 53bb986)
2018-05-03 17:48:49 +01:00
cburlinchon
fe87f16d98
Register crypto providers after we init logging (#3067)
* Register crypto providers after we init logging
2018-05-03 16:24:54 +01:00
Katelyn Baker
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
Roger Willis
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
Chris Rankin
11b7bfcaf5
Do not shade references to external annotations. (#802) 2018-05-03 14:27:51 +01:00