11911 Commits

Author SHA1 Message Date
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
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