ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-21 01:42:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,761 Commits 96 Branches 407 Tags
Commit Graph

11761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Shams Asari
adef57f127
Including FlowException in the RPC exception whitelist (CORDA-1264) (#3037) 
These exceptions are designed to be propagated in P2P and so makes sense to keep them visible if the recipient is an RPC user.
 2018-05-01 07:48:50 +01:00
Shams Asari
42edf58b92
Introducing AbstractArgsParser which removes the boilerplate of printing help and exiting the process on cmd line errors. (#3040) 2018-04-30 22:22:51 +01:00
Maksymilian Pawlak
b6e610252f Merge commit 'b210f7ab0ba141a6a02e445741dcdab6f9c5b303' into os-merge-30-04 
# Conflicts:
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
 2018-04-30 18:22:33 +01:00
Tudor Malene
7bbae1c311 Fix docs 2018-04-30 18:08:35 +01:00
Tudor Malene
772061bab5
Merge pull request #793 from corda/feature/ENT-1823/publish_migration_tool 
ENT-1823 Publish migration tool
 2018-04-30 17:42:23 +01:00
Andrzej Cichocki
2a37ce438a
ENT-1831 Delete notaryhealthcheck which is now in CC (#791) 2018-04-30 17:23:59 +01:00
Matthew Nesbit
647b821c1c
Merge pull request #787 from corda/mnesbit-add-socks-config-example 
Add an example config with SOCKS config and load it in test
 2018-04-30 16:31:31 +01:00
Katarzyna Streich
f25b0bd1c5
Add more documentation on private networks (#786) 
Add more documentation on private networks
 2018-04-30 16:01:53 +01:00
tudor.malene@gmail.com
e49fbaa956 ENT-1823 Publish migration tool 2018-04-30 15:41:03 +01:00
Joel Dudley
09a35f8e68
Splits node structure from node creation. Tweaks. (#3015) 2018-04-30 15:19:59 +01:00
Joel Dudley
79cbaf8adf
Makes it clear that notaries are clusters or 1+ nodes. 2018-04-30 14:58:13 +01:00
Christian Sailer
e62d1f12c1
DEVOPS-663 Publishing of performance test artefacts (#769) 
* Enable publishing of perftest cordapps

* Enable publishing of jmeter-corda as capsule jar

* Enable publishing of jmeter-corda as capsule jar

* jar name

* Correct module name to publish
 2018-04-30 14:41:55 +01:00
PyPie
beef7bdfba A typo fix. 
Line 108
Was: We want to create an IOU of 100 with PartyB. We start the ``IOUFlow`` by typing:
Should be We want to create an IOU of 99 with PartyB. We start the ``IOUFlow`` by typing:
 2018-04-30 13:54:14 +01:00
Chris Rankin
72ba01669a
Move platformSecureRandom property into a separate class. (#790) 
This allows it to be deleted completely from core-deterministic.
 2018-04-30 13:45:46 +01:00
Chris Rankin
d039ede537
Configure Gradle's wrapper task. (#3033) 2018-04-30 12:47:04 +01:00