Commit Graph

12993 Commits

Author SHA1 Message Date
06d27b57c1 CORDA-1662 - Corda Serialization Evolution breaksdown with Java classes (#3427)
Nullability logic was relying on annotations that Kotlin applies by
default but is left to the developer in Javaland. Change this around
so it works for both.

In Kotlin, the property must be nullable, in Java, it can't be a
primitive.
2018-06-26 09:31:35 +01:00
b0946f0a97 [ENT-1994] Add documentation for operational node upgrades (#1036)
* Add documentation for operational node upgrades

* Add documentation for operational node upgrades

* Address review comments

* Some additional detail added after Richards comments

* Restructure page to make more logical sense
2018-06-25 17:35:11 +01:00
e00c7706c3 CORDA-1661 Reverting DEV certificates (#3422)
* CORDA-1661 Reverting DEV certificates

* Addressing review comments

* Removed the intermediate certificate from the trust store and added some test cases for the revocation check
2018-06-25 16:40:51 +01:00
868763f82b Fix for running tests from Idea (#3425) 2018-06-25 15:15:52 +01:00
21d06a8aa9 ENT-2132 Introduce a boolean flag which controls whether we should re-try RPC connection. (#3433)
In case of initial logon - it will not be re-tried to cater for invalid endpoint and/or credentials.
However, if connection been successfully established once, re-try logic is getting activated.
2018-06-25 14:13:21 +01:00
2a050481f6 Merge pull request #1064 from corda/os-merge-b97af47 2018-06-25 13:54:16 +01:00
9be4c5dca4 CORDA-1567 Remove all traces of the out-of-process verifier (#3424) 2018-06-25 13:01:33 +01:00
34e52551fd [CORDA-1663]: Node won't start if cordapps generate states prior to deletion (fix). (#3432) 2018-06-25 11:59:43 +01:00
98cd8be160 Merge remote-tracking branch 'open/master' into os-merge-b97af47
# Conflicts:
#	.idea/compiler.xml
#	docs/source/changelog.rst
#	docs/source/release-notes.rst
#	node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
#	tools/bootstrapper/build.gradle
2018-06-25 11:38:30 +01:00
b97af477b2 CORDA-1603: Class carpenter able to synthesis Cash.State objects (#3400)
This requires the class carpenter to be able to run in a "lenient" mode where it permits synthesised classes to implement interfaces with unimplemented methods.
2018-06-25 11:33:37 +01:00
6a51ed1f8d Merge pull request #951 from corda/colljos-dev-publish-artifactory
Fix incorrect repoKey used to publish to Artifactory.
2018-06-25 10:35:57 +01:00
68d4ed0cd9 [ENT-1955] Fix LaTeX errors when building docs PDF (#3426)
* Fix latex errors when building docs PDF

* Experimenting
2018-06-24 11:04:08 +01:00
7d975a43e0 Merge pull request #1058 from corda/chrisr3-os-merge
Merge from Open Source.
2018-06-23 17:32:27 +01:00
3046843d40 CORDA-1602: Added cmd line flags to the network bootstrapper (#3419)
The list of CorDapps jars is no longer passed in via the cmd line but is now expected to be placed in the bootstrapped directory.

Ended up being a bit of a refactor to cater for unit testing, and also tidied up the bootstrapper docs.
2018-06-23 11:36:10 +01:00
8b3a5432cb Merge commit '02348a584d56cdb562581d99be5b56348f7d1001' into chrisr3-os-merge 2018-06-23 00:06:11 +01:00
c35f576091 ENT-1953 enterprise tuning config documentation (#996)
* ENT-1953 enterprise tuning config documentation

* Add information about suspended flows

* Review: dropped all the dangerous low level flags that should not be tweaked by users, added some more general explanation.

* Review: typo plus comment about db impact

* Reshuffle doc to be more consistent

* Review: more refinements

* Reflect smart default values for performance properties

* Code review: typo
2018-06-22 21:41:31 +01:00
366af50150 CORDA-1644: Add a more descriptive error message when the notary type is mis-configured. 2018-06-22 17:00:03 +01:00
2fe5bae8a7 ENT-1953 enterprise tuning config (#1057)
* ENT-1953 enterprise tuning config

* Keep flowThreadPoolSize at 1 for integration tests as some expect certain ordering it seems.

* Log thread count for SMM
2018-06-22 16:39:17 +01:00
84cdf22e5f Merge pull request #1056 from corda/ENT-2117/aslemmer-remove-sgx-code
ENT-2117: Remove sgx code
2018-06-22 15:34:37 +01:00
465915ac83 [ENT-1289] Exit node if db down (#918)
* Exit if the db connection is lost
2018-06-22 14:57:43 +01:00
02348a584d CORDA-1639: Resolve ProviderMismatchException when copying a file into a ZIP. (#3421)
* Resolve ProviderMismatchException when copying a file into a ZIP.
* Review tweaks.
2018-06-22 12:12:31 +01:00
747dee9b8b Delete/move sgx-jvm to oblivium-old 2018-06-22 10:44:00 +01:00
013f1a3cb6 Remove verify-enclave 2018-06-22 10:31:00 +01:00
dcfcd4f64b git mv hsm-tool 2018-06-22 10:24:24 +01:00
687ed95994 CORDA-1407 Fix explorer rpc access rights (#3413) 2018-06-22 09:48:13 +01:00
d0300261cb Merge pull request #1052 from corda/tudor-merge-21-06
Tudor merge 21 06
2018-06-22 09:33:46 +01:00
b9eb956c6e ENT-1463, ENT-1903: Document new minimum JDK version. (#3418) 2018-06-22 09:24:13 +01:00
692d421abf ENT-1892, ENT-1875 - doc fixes (#1048) 2018-06-22 09:23:47 +01:00
a76c093df5 [ENT-2115]: Drop CONTRIBUTORS.md. (#1053) 2018-06-22 09:11:14 +01:00
473d97e6c4 Upgrade to Gradle 4.8.1 (#3420)
See: https://github.com/gradle/gradle/releases/tag/v4.8.1
2018-06-22 08:36:04 +01:00
3125ec9f73 [ENT-1955] Documentation fixes (#3417) 2018-06-21 16:57:30 +01:00
1905f23093 fix merge 2018-06-21 16:51:58 +01:00
fb3e216318 Merge remote-tracking branch 'open/master' into tudor-merge-21-06
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
#	tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
2018-06-21 16:51:19 +01:00
66b67b231a [CORDA-1597] Make the NodeArgsParser fail on unrecognized (non-option… (#3394)
* [CORDA-1597] Make the NodeArgsParser fail on unrecognized (non-option) arguments.

* Respond to feedback from anthonykeenan.
2018-06-21 16:50:02 +01:00
381aadc78f ENT-1796 RPC SSL (#3401)
* ENT-1796 add just-generate-rpc-ssl-settings command line flag. Fix ssl configuration and documentation

* ENT-1796 small fix. change alias

* ENT-1796 address code review changes

* ENT-1796 revert file

* ENT-1796 Added check to display better error message

* ENT-1796 Doc fixes
2018-06-21 16:46:05 +01:00
62088e4710 Fixes (#1050) 2018-06-21 16:35:20 +01:00
d7ee6fc361 Merge pull request #1044 from corda/andrius/merge-06-21-2
Andrius/merge 06 21 2
2018-06-21 15:55:05 +01:00
cdd223378e Fixes (#1045) 2018-06-21 15:37:45 +01:00
a9cdb576e6 Merge remote-tracking branch 'open/master' into andrius/merge-06-21-2 2018-06-21 14:02:37 +01:00
bafe387e93 Revert "Change to use MDC logic in bridge/AMQP protocol logging (#3398) (#1034)"
This reverts commit dd74fd2e28.
2018-06-21 13:57:44 +01:00
227ca3b65b CORDA-1610: Retain progress tracker during flow retry.
Make sure the same progress tracker object is re-used in the restarted flow so subscribers can keep receiving progress updates.
2018-06-21 11:44:13 +01:00
3af5412d40 ENT-1741 Build standalone shell JAR distribution (#3409) 2018-06-21 10:32:36 +01:00
dd74fd2e28 Change to use MDC logic in bridge/AMQP protocol logging (#3398) (#1034) 2018-06-21 09:37:48 +01:00
2f34b16b07 Fix to allow equality of hostname (#3381)
* Fix to allow equality of hostname

* Remove unreliable require test per pull 3381

* Remove unreliable require test per pull 3381
2018-06-21 09:03:32 +01:00
5685b9f2db ENT-2106 Change RPC connection pooling in JMeter samplers to avoid running out of file descriptors (#1033) 2018-06-20 18:32:37 +01:00
ed3944c546 Create Artemis p2p.inbound addresses before starting the broker (#3407) 2018-06-20 16:24:30 +01:00
9b5a099302 ENT-2105: Remove unnecessary sourceSets from integration tests. (#1029)
The database scripts are already available from the test-utils JAR via the classpath and so don't need
to be included as additional source sets.
2018-06-20 15:38:48 +01:00
0a1f49fbaf Perftestcordapp result contains immutable list (#1027) 2018-06-20 15:24:51 +01:00
867e8a85af ENT-2035 Use ./drives folder for JDBC jars instead of one specified by jarDirs configuration option (#1023) 2018-06-20 13:45:20 +01:00
ddcdb370b3 ENT-2053 Artemis cleanup fix (#987)
* Bridge kill test

Fix Artemis settings

ENT-2053: add quasar for gradle file

Add several flow + bridge kill test

Debugging

Potential fix

* ENT-2053: create p2p queues in exclusive mode to avoid reordering when bridge is killed

* ENT-2053: add exclusive flag to rest of p2p queues

* ENT-2053: check addresses' types when creating queues for exclusive mode

* Revert "Debugging"

This reverts commit d48a49c91f3fba0609b9b744c78fc671f4a92076.

* ENT-2053:address PR comments
2018-06-20 13:06:24 +01:00