ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-07 11:30:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,676 Commits 95 Branches 407 Tags
Commit Graph

11676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Andrius Dagys
253de5dc75
Merge pull request #803 from corda/andrius/os-merge 
OS merge
 2018-05-04 08:50:55 +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
Andrius Dagys
855f89b61e Merge remote-tracking branch 'open/master' into andrius/os-merge 2018-05-03 13:37:39 +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
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
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
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
Katelyn Baker
e338414cd4
CORDA-847 - RPC Clent lib refactoring (#3052) 
Move Kryo into it's own sub module
 2018-05-01 20:52:19 +01:00
josecoll
764af04608 Moved RPC Proxy to own module in testing/qa/behave/tools 
Incorporating PR review feedback.

Minor fixes to default path and additional copying of startup script.
 2018-05-01 17:04:46 +01:00
Katelyn Baker
0c680ae530
CORDA-1403 - Generics serialization issue (#3030) 
When implementing a generic interface subtype check fails, need
to compare to the actual raw type
 2018-05-01 16:27:54 +01:00
Maksymilian Pawlak
8eb976d035
Merge pull request #795 from corda/m4ksio-os-merge-30-04-2018 
Merged https://github.com/corda/corda/pull/2994 and fixed conflicts
 2018-05-01 16:00:42 +01:00
Shams Asari
33b9040efb
CORDA-1389: gradle plugins version bump (#3048) 2018-05-01 16:00:19 +01:00
Maksymilian Pawlak
29615f512e Close DB after test 
Add unique node prefix to DB source
 2018-05-01 14:37:35 +01:00
Michele Sollecito
92922b874c
[CORDA-1397]: Fixed incorrect exception handling in NodeVaultService._query(). (#3043) 2018-05-01 19:33:13 +07:00
Michele Sollecito
5565b3e80d
[CORDA-1411]: Prevent MappedSchema caching from leaking memory. (#3042) 2018-05-01 19:32:29 +07:00
Joel Dudley
eb0fbb03e3
Adds contributors who contributed to example and template CorDapps. (#3045) 2018-05-01 13:27:58 +01:00
Konstantinos Chalkias
5bbfde3d35
Run filterMyKeys only when required (in NodeVaultService) (#3014) 2018-05-01 13:24:06 +01:00
Tudor Malene
5edb414a07
Merge pull request #794 from corda/feature/small_fix_doc 
Fix docs
 2018-05-01 13:12:45 +01:00
Maksymilian Pawlak
597a15a230 Compilation fix 
Daily DB integration test ignore, to release merge lock and allow for proper refactor
 2018-05-01 12:33:13 +01:00
Maksymilian Pawlak
bc77492d45 Compilation fix 2018-05-01 10:48:56 +01:00
Joel Dudley
4ba794bc1a
Section in contributors.md for code contributions. (#3038) 
* Section in contributors.md for code contributions.

* Removes design/PR distinction. Expands list.
 2018-05-01 09:18:35 +01:00