11892 Commits

Author SHA1 Message Date
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
Andrius Dagys
524ba27721 Fix merge issues 2018-05-03 13:52:11 +01:00
Matthew Nesbit
0494e45037
Remove debug logging left over from earlier AMQP development. (#2867) 2018-05-03 13:44:05 +01:00
Andrius Dagys
855f89b61e Merge remote-tracking branch 'open/master' into andrius/os-merge 2018-05-03 13:37:39 +01:00
Katelyn Baker
20570d72cf
CORDA-1238 - Move blob inspector initial work into experimental (#3058)
* CORDA-1238 - Initial blob inspector tool commit

Note this is WIP and not ready for prime time but it's time it moved off
of a personal branch and into the main code base, especially if I'm
passing the serialization code onto someone else's shoulders

* CORDA-1238 - Move blob inspector into experimental

It was developed locally in tools (as it's a tool), but it's no
where near production ready, so lets just ship it in experimental
for now

* CORDA-1238 - Tidyup and bug fixes
2018-05-03 13:25:29 +01:00
Shams Asari
9ffb43f3f7
CORDA-1385: Ignore duplicate packages and sub-packages in driver extraCordappPackagesToScan (#3066)
Otherwise duplicate test CorDapps are loaded into the node
2018-05-03 12:28:36 +01:00
Michal Kit
c044096260
Merge pull request #801 from corda/mkit-os-ent-merge
OS -> ENT Merge up to ab80df342ab8a7ede0539daaee9fcecd02f6aeeb
2018-05-03 12:23:28 +01:00
Chris Rankin
a6b7257491
CORDA-1441: Upgrade to Kotlin 1.2.41 (#3063) 2018-05-03 12:12:54 +01:00
Katarzyna Streich
2e1cee00f7
ENT-1608: Check that notary identities are registered (#799)
Check that notary identities are registered

On loading new parameteres check that provieded notary identities were
registered by doorman.
Refactor of NetworkParameters loading code in network-management.
2018-05-03 11:09:11 +01:00
Michal Kit
e5e98f3540 Merge OS commit 'ab80df342ab8a7ede0539daaee9fcecd02f6aeeb' into enterprise 2018-05-03 10:55:40 +01:00
Joel Dudley
6b65ea06ac
Link back to contributing.md. Instructions on updating docs. Tweaks. (#3064) 2018-05-03 10:31:22 +01:00
josecoll
6c4da2a3a0 Added Java properties to configure location of Node configuration directories and JDBC driver jar. 2018-05-02 17:59:28 +01:00
Matthew Nesbit
c3429cc621
Merge pull request #797 from corda/mnesbit-fix-bridge-config-typo
Bridge HA config strings hould be URL like.
2018-05-02 17:03:56 +01:00
szymonsztuka
23c604b1db
Vault queries - change SQL generation for aggregate function in 'group by' clause. (#3016)
Vault queries: 'order by' function aggregation e.g. 'order by sum(col)' is replaced by the position of the selected column (e.g. 'order by 1'). 
Rationale: A database may be unable to support aggregation function in order by clause e.g. 'order by (sum col_x)' and Hibernate can't produce alias in this case e.g. ' select sum(col_x) as alias_x... order by also_x ...', the best universal solution is to use positional parameter e.g. 'select sum(col_x) as alias_x... order by 1 ...'

(cherry picked from commit 416d4ec)
2018-05-02 16:59:13 +01:00
szymonsztuka
81905ac400
Merge OS -> ENT up to c3e6b39 (including) pull request #796 2018-05-02 15:57:28 +01:00
josecoll
3f0f603ded Final clean-up. 2018-05-02 15:52:35 +01:00
josecoll
c27003b471 Revert: Extensions to Corda Behave for CTS. 2018-05-02 15:51:45 +01:00
Katelyn Baker
0d3c7e7762
CORDA-847 - RPC Server lib refactoring (#3056)
Just as we did for the RPC CLient, refactor kryo specific elements into
their own sub module. Also move kryo specific components out of generic
RPC files.

Thus, adding AMQP support will be a much smoother operation
2018-05-02 15:48:41 +01:00
Viktor Kolomeyko
884928c956
CORDA-1416: Upgrade version of Proton-J library (#3050)
* CORDA-1416: Upgrade version of Proton-J library

* CORDA-1416: Compilation fixes following Proton-J upgrade

Reflects:
https://issues.apache.org/jira/browse/PROTON-1712
and
https://issues.apache.org/jira/browse/PROTON-1672

* CORDA-1416: Add an integration test to prove that data saved by from previous version can be read.

* CORDA-1416: Add additional check validate serialized form.
2018-05-02 15:14:45 +01:00
Matthew Nesbit
94bb3bd0bf The bridge HA configuration string was meant to be URL like. Correct the typo in this from zk//: to zk:// 2018-05-02 14:36:02 +01:00
Patrick Kuo
bb76c5bcde
Merge pull request #3054 from corda/pat/registration-tool-bugfix
Bug fix: registration tool doesn't register for service identity if keystore already contains node cert
2018-05-02 13:50:58 +01:00
szymonsztuka
37b715c955 Revert "artemis upgrade to 2.5.0 (#3029)"
This reverts commit c3e6b39
2018-05-02 13:47:19 +01:00
josecoll
8f47fe8c68 Extensions to Corda Behave for CTS.
Minor fixes following integration and regression testing with CordaRPCProxy

Remove unrelated code.

Address remaining PR review comments.
2018-05-02 12:31:22 +01:00
josecoll
a5e2058a5b
Merge pull request #762 from corda/colljos-qa-scenarios
ENT-1834: Compatibility Test Suite QA scenarios
2018-05-02 12:30:47 +01:00
Andrius Dagys
3bf1e803d9
Move notary service related classes and interfaces in core to interna… (#2827)
* Move notary service related classes and interfaces in core to internal, since we won't be able to stabilise the APIs for writing custom notary services any time soon (the docs already mention it). I left out the wire protocol related classes so we don't accidentally break it.
2018-05-02 12:21:38 +01:00
josecoll
6b65bead21
Merge pull request #761 from corda/colljos-behave-rpc-proxy
ENT-1834: QA HTTP-RPC Proxy for mixed Corda Node testing using CTS
2018-05-02 12:14:25 +01:00
josecoll
f013c1dcb7 Address remaining PR review comments. 2018-05-02 11:09:25 +01:00
josecoll
ccd5f5fd5b Re-apply previous fixes. 2018-05-02 10:47:12 +01:00
josecoll
d840099049 Minor updates following PR review feedback. 2018-05-02 10:30:38 +01:00
Shams Asari
514287e694 Fixed invalid page ref in upgrade-notes.rst (#3053) 2018-05-02 10:10:23 +01:00
Patrick Kuo
2750017b8e Bug fix: registration tool doesn't register for service identity if keystore already contains node cert (#756)
* fix a bug where registration tool will refuse to register for a service identity if the keystore contain NODE_CA key already.
some refactoring

(cherry picked from commit 5ed60ab)
2018-05-02 09:59:12 +01:00
Patrick Kuo
5ed60ab60d
Bug fix: registration tool doesn't register for service identity if keystore already contains node cert (#756)
* fix a bug where registration tool will refuse to register for a service identity if the keystore contain NODE_CA key already.
some refactoring
2018-05-02 09:54:28 +01:00
szymonsztuka
b19dac02c4 remove temporary code, reorder lines 2018-05-02 00:11:18 +01:00
szymonsztuka
1a616b1063 resolve merge conflicts - compilation error, fix integration tests in remote database mode 2018-05-01 23:48:13 +01:00
szymonsztuka
b25892e45b resolved conflicts 2018-05-01 21:32:11 +01:00