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
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
Michele Sollecito
5565b3e80d
[CORDA-1411]: Prevent MappedSchema caching from leaking memory. ( #3042 )
2018-05-01 19:32:29 +07: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
Michal Kit
ab80df342a
CORDA-1319 Adding CRL checking for nodes ( #2987 )
...
* Adding CRL support for nodes
* Addressing review comments
2018-04-30 09:26:26 +01:00
bpaunescu
c3e6b39e59
artemis upgrade to 2.5.0 ( #3029 )
2018-04-27 19:54:08 +01:00
sollecitom
70b32636b5
Merge remote-tracking branch 'remotes/open/master' into merges/april-27-09-38
...
# Conflicts:
# docs/source/changelog.rst
# node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
2018-04-27 10:12:15 +01:00
Michele Sollecito
235df69efe
[CORDA-1379]: Allow soft trapping of unknown config keys. ( #3011 )
2018-04-27 15:33:13 +07:00
Joel Dudley
efa69ce959
Whitelists Triple.
2018-04-27 08:57:28 +01:00
szymonsztuka
cec2f25c67
ENT-1627 - Allow to set hibernate.dialect setting for pluggable database ( #687 )
...
Optional property `database.hibernateDialect` which maps to `hibernate.dialect`.
2018-04-26 19:05:55 +01:00
Thomas Schroeter
61d2212840
Merge remote-tracking branch 'open-source/master' into thomas-merge
...
experimental/behave/src/main/kotlin/net/corda/behave/logging/LogUtilities.kt
node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
2018-04-26 14:47:29 +01:00
Thomas Schroeter
2ff3939e2e
Add exponential backoff to P2P messaging retry ( #2975 )
2018-04-26 13:58:41 +01:00
Chris Rankin
e135cf062c
Merge commit '5f70b6e04954a6dc64a1a56089eeccb2966bb0ae' into chrisr3-os-merge
2018-04-24 18:09:41 +01:00
Chris Rankin
8e507d0b88
CORDA-1263: Replace deprecated kotlin-stdlib-jre8 with kotlin-stdlib-jdk8. ( #2992 )
2018-04-24 14:03:41 +01:00
Shams Asari
65525d74e7
CORDA-1325: Bootstrapper unable to whitelist two versions of the same contract simultaneously ( #2980 )
...
Also added unit tests
2018-04-24 10:51:24 +01:00
bpaunescu
c4ceca3787
Merge pull request #2989 from corda/ENT-1775-PR759
...
ENT-1775: reworked client to handle failover in HA mode instead of Artemis
2018-04-23 17:15:00 +01:00
Shams Asari
5f781193b6
Merge remote-tracking branch 'open/master' into os-merge-d3446e2
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
# tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeController.kt
2018-04-23 15:50:24 +01:00
Shams Asari
d3446e213c
Introduced a few more extension methods to Path, which are clearer than the static methods in Files. ( #2985 )
...
Also migrated code away from the old File API.
2018-04-23 14:31:49 +01:00
Viktor Kolomeyko
f1fd1cefd8
Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/corda-os-merge
2018-04-23 14:19:51 +01:00
Viktor Kolomeyko
3aaa176dd4
CORDA-1355: Introduce a dedicated property which controls what is going to be in scope for classpath scanning ( #2977 )
...
* CORDA-1355: Introduce a dedicated property which controls what is going to be in scope for classpath scanning
* CORDA-1355: Update change log
* CORDA-1355: Minor change to improve readability.
* CORDA-1355: Custom serializers documentation update to mention new system property.
2018-04-23 13:55:40 +01:00
josecoll
15c015e0d6
Merge branch 'master' into colljos-merge-230418
2018-04-23 12:12:16 +01:00
Viktor Kolomeyko
bf4d8ba08c
CORDA-1335: Scan attachment Jar only to speed-up the process. ( #2982 )
...
* CORDA-1335: Scan attachment Jar only to speed-up the process.
* CORDA-1335: Explicitly mention other types of contracts to scan.
* CORDA-1335: Refactor to eliminate listing different subclasses of Contract in two separate places.
2018-04-23 09:17:43 +01:00
bpaunescu
be083d6763
Added helper method for creating tcp transports from a list of host:port
2018-04-22 15:04:19 +01:00
Matthew Nesbit
942da1b8e0
First cut HA for bridge
...
Simple implementation of bridge HA logic. Fix of shading magic in gradle. Removal of exposed curator classes from node-api interface.
Simple implementation of bridge HA logic. Fix of shading magic in gradle. Removal of exposed curator classes from node-api interface.
Modify leader priority test to catch lexical rather than numeric sorting.
2018-04-19 16:00:11 +01:00
josecoll
b3a4e3907f
OS -> ENT Merge ( #757 )
...
* Better cert path validation exception message for PartyAndCertificate.verify (#2976 )
* Corda Behave extensions for CTS (#2968 )
* Updated to Corda 3.0, added support for PostgreSQL, added STAGING_ROOT environment variable, incorporating Watch improvements (Maks), Steps Provider interface for auto-scanning of 3rd party steps providers, re-implemented StepBlocks, new ScenarioRunner executable tool, additional Steps definitions (Vault, issue/transfer cash, cordapps), other minor bug fixes and logging improvements.
* Updates incorporating PR review feedback.
* Reverted back to original - will re-test in ENT.
* Removed all SQL Server code (to be included in ENT only)
* Minor updates following second PR review.
* Fixed broken scenario tests.
* Final fix for PostgreSQL scenario test.
2018-04-19 11:49:17 +01:00
Shams Asari
a684507553
Better cert path validation exception message for PartyAndCertificate.verify ( #2976 )
2018-04-18 17:27:03 +01:00
Anthony Keenan
af77c5a287
Merge remote-tracking branch 'open/master' into anthony-os-merge-20180418
...
# Conflicts:
# constants.properties
# docs/source/changelog.rst
2018-04-18 11:24:22 +01:00
Shams Asari
60323cca15
CORDA-1312: Network bootstrapper copies any CorDapp jars into each nodes' cordapps dir ( #2974 )
2018-04-17 15:38:25 +01:00
Matthew Nesbit
1c169d035a
Shade the zookeeper libraries to avoid version conflicts
...
Add comment to explain gradle logic
2018-04-17 12:07:09 +01:00
tudor.malene@gmail.com
47cc2f0bb1
Merge remote-tracking branch 'open/master' into merge/tudor_16_04_18
2018-04-16 13:32:01 +01:00
Tudor Malene
9d2b7f0b7b
CORDA-1313 RPC whitelist TransactionVerificationException ( #2965 )
2018-04-16 13:29:36 +01:00
Christian Sailer
408582cd05
OS -> R3 Corda up to CORDA-1336
...
OS -> R3 Corda up to d8bf1019b6c7ddbe709cff7c730e66eb576f9ad5
2018-04-13 18:09:30 +01:00
Tudor Malene
d34d599baf
fix url ( #735 )
2018-04-13 16:58:19 +01:00
Christian Sailer
a0bf0261bb
Merge commit 'd8bf1019b6c7ddbe709cff7c730e66eb576f9ad5' into christians/merge-CORDA-1336
2018-04-13 16:39:00 +01:00
Christian Sailer
d8bf1019b6
CORDA-1336: Turn off direct delivery in Artemis via config ( #2961 )
...
* CORDA-1336: Turn off direct delivery in Artemis via config - this can
deadlock when the server gets busy and switches back and forth between
direct and async delivery if it can't keep up.
* CORDA-1336: put in a comment explaining the config setting.
2018-04-13 16:17:24 +01:00
Katarzyna Streich
91c52af5ac
ENT-1584: Subscribe to private network maps using UUIDs ( #2922 )
...
Client private network map implementation
Add private network maps UUIDs to config as extraNetworkMapKeys. Adjust NetworkMapServer implementation accordingly.
Change NetworkMapUpdaterTest to use NetworkMapServer instead of mock
2018-04-13 10:52:45 +01:00
Katelyn Baker
5bb9514582
Merge remote-tracking branch 'open/master' into kat-merge-180412
2018-04-12 20:34:28 +01:00
Shams Asari
02913b284e
CORDA-1312: Removed the need to have whitelist.txt for updating the contracts whitelist using the bootstrapper. ( #2954 )
...
Instead the current whitelist is read in from the existing network parameters file.
2018-04-12 17:03:06 +01:00
Patrick Kuo
80c075b19e
Merge pull request #2958 from corda/pat/ent-1323-cherrypick
...
ENT-1323 Network map service to check all identities in submitted node info
2018-04-12 14:04:47 +01:00
Patrick Kuo
b5f304a104
ENT-1323 Network map service to check all identities in submitted node info ( #499 )
...
* ENT-1323 Network map service to check all identities in submitted node info
* fixup after rebase
* address PR issues, refactored createValidNodeInfo
* address PR issues
(cherry picked from commit f9ed55b)
2018-04-12 13:11:30 +01:00
Patrick Kuo
f9ed55b731
ENT-1323 Network map service to check all identities in submitted node info ( #499 )
...
* ENT-1323 Network map service to check all identities in submitted node info
* fixup after rebase
* address PR issues, refactored createValidNodeInfo
* address PR issues
2018-04-12 13:05:15 +01:00
Kat Baker
e6d352e446
Review comments
2018-04-12 12:09:17 +01:00
Kat Baker
03850dabc2
Review comments
2018-04-12 11:58:56 +01:00
Kat Baker
c783c431b1
Fix broken comment
2018-04-12 11:23:13 +01:00
Kat Baker
84914aa5c8
Remove commented out code
2018-04-12 11:18:39 +01:00
Katelyn Baker
f19bcea82f
CORDA-1229 - Setter serialization fails with lists
...
Looks like the super / sub type inference of setter param vs
getter param is the wrong way around. Also, Setter Type should
be the generic type, not just the type
the property must be a supertype of the setter parameter
the getter must be a supertype of the setter parameter
2018-04-12 11:17:26 +01:00
Tudor Malene
241f7738e4
ENT-1704 restructure db migration documentation ( #636 )
2018-04-11 16:48:25 +01:00
Matthew Nesbit
e51de2739c
When discarding invalid messages we should consume them. When starting up wait for node bridge registration before activating the float, otherwise we have a race condition.
...
Reduce excessive logging
Address PR comments
Address PR comments
2018-04-11 15:26:27 +01:00
bpaunescu
f022c67689
ENT-1618: added support for RPC client in HA mode(automatic failover) ( #706 )
...
* ENT-1618: added support for RPC client in HA mode(automatic failover)
* RPCClient: renamed variables to avoid confusion about clustering
2018-04-10 12:38:37 +01:00