Shams Asari
4b86362391
Merge remote-tracking branch 'open/master' into shams-os-merge-250118
...
# Conflicts:
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt
# core/src/test/java/net/corda/core/flows/FlowsInJavaTest.java
# docs/source/changelog.rst
# docs/source/corda-configuration-file.rst
# docs/source/upgrade-notes.rst
# finance/src/test/kotlin/net/corda/finance/contracts/CommercialPaperTests.kt
# finance/src/test/kotlin/net/corda/finance/contracts/asset/CashTests.kt
# gradle/wrapper/gradle-wrapper.properties
# node-api/src/main/kotlin/net/corda/nodeapi/internal/KeyStoreConfigHelpers.kt
# node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/SetsSerializationTest.kt
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/SSHServerTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
# node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/main/resources/reference.conf
# node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# node/src/test/kotlin/net/corda/node/services/network/NetworkMapCacheTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/network-visualiser/src/main/kotlin/net/corda/netmap/NetworkMapVisualiser.kt
# samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/internal/TestNodeInfoBuilder.kt
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
# webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-01-25 17:51:13 +00:00
Joel Dudley
b8f25fe689
Docs on contributing to Corda
2018-01-25 17:15:36 +00:00
Michal Kit
83ea4611ca
Addressing multiple key groups. Removing redundant config parameters for private key passwords ( #409 )
2018-01-25 16:40:42 +00:00
Michal Kit
5f1590d97f
Cherry picked commit from the release DEV preview branch. This is the fix for the database config not being honoured by doorman ( #408 )
2018-01-25 15:41:59 +00:00
Mike Hearn
17a6f61eba
Simplify CashTests and add some comments/convenience APIs to MockServices ( #2241 )
2018-01-25 16:29:26 +01:00
Andrzej Cichocki
242d9cf7ad
CORDA-692 Don't include internal packages in API documentation ( #2415 )
...
* Use G1 for gradle daemon
2018-01-25 15:26:13 +00:00
Joel Dudley
471907366b
Renames Controller to NetworkMapAndNotary, in line with templates and example CorDapp.
2018-01-25 15:14:32 +00:00
josecoll
371cb0a081
Gradle plugins: additional of publish sources configuration field ( #2420 )
...
* Gradle plugins change: publication of source code is config driven (defaults to true).
2018-01-25 14:40:11 +00:00
Michele Sollecito
9783f11ba8
Exposed RPC SSL settings through Cordformation ( #2419 )
2018-01-25 14:32:58 +00:00
igor nitto
1be4f0950d
Remove compile time dependency on JDBC drivers [ENT-1363] ( #387 )
...
* Change JDBC drivers dependencies to integrationTestRuntimeOnly
* Added smoke test validating JDBC driver registration located in "./plugins" directory
* Some docsite tweaks
2018-01-25 13:38:51 +00:00
Thomas Schroeter
b50ce0ab8d
HA-notary health check flow ( #396 )
...
* Add simple notary health check flow
* Move notary test to notary health check
* Rebase
2018-01-25 10:34:07 +00:00
jamesbr3
5f8af818b1
Merge pull request #2408 from corda/jamesbr-remove-jolokia-war
...
Remove jolokia war reference from webserver
2018-01-24 21:19:50 +00:00
Shams Asari
0fa6969d5d
Added various X509 utilities to remove some of the existing boilerplate. ( #2416 )
2018-01-24 18:07:29 +00:00
Katelyn Baker
3c95772288
Merge pull request #2418 from corda/kat/feature/gradleUpgrade4.4.1
...
Upgrade gradle to 4.4.1
2018-01-24 17:29:03 +00:00
Joel Dudley
52ae34782d
Removes a reference to the bundled node webserver.
2018-01-24 16:41:49 +00:00
Patrick Kuo
5be4df918e
Make truststore password configurable during root store generation in doorman ( #388 )
...
* Doorman will now ask for truststore password, or can be provided in cmd line arg.
* rebase and changed keystore filename for HSM
* make "network-root-truststore.jks" a const
2018-01-24 16:17:32 +00:00
Katelyn Baker
51d6209c97
Upgrade gradle to 4.4.1
2018-01-24 16:15:43 +00:00
Mike Hearn
cfb8997f23
Fix build break due to an API change between PR check and merge
2018-01-24 17:14:03 +01:00
Ben Wyeth
d17670c747
Provide an API to register callback on app shutdown ( #2402 )
...
Provide an API to register callback on app shutdown.
2018-01-24 16:19:24 +01:00
Michele Sollecito
3c0e006456
Reverted incorrect additional advertised RPC address in NodeInfo ( #2417 )
2018-01-24 14:42:07 +00:00
Patrick Kuo
45b23737c7
Fix broken network management server status endpoint ( #397 )
...
* add missing Path annotation and test
* Address PR issue
2018-01-24 14:41:12 +00:00
Michal Kit
55385613ac
Removing configuration parameter for private key passwords ( #395 )
2018-01-24 12:12:46 +00:00
Tudor Malene
cef1f9885c
ENT-1282: create standalone db migration tool ( #356 )
...
* ENT-1282: add standalone db migration tool that works with both the node and the doorman
* ENT-1282: remove cmd line args during node startup
* ENT-1282: more clear message
* ENT-1282: fix integration test
* ENT-1282: more fixes and cleanup code
* ENT-1282: address PR comments
* ENT-1282: more fixes and refactoring
* ENT-1282: more classloader fixes
* ENT-1282: changes after demo feedback
* ENT-1282: update API
* ENT-1282: update documentation
* ENT-1282: formatting
* ENT-1282: added CONSOLE option for dry-run and logging
* ENT-1282: documentation changes
* ENT-1282: remove getMigrationResource from the public API
* ENT-1282: removed dependency on network-manager, added release-lock
* ENT-1282: Update documentation
2018-01-24 11:55:43 +00:00
Shams Asari
61c7de22d6
Replaced KeyStoreWrapper with X509KeyStore, which is still a wrapper but assumes only X509 certs and has better APIs ( #2411 )
2018-01-24 07:51:55 +00:00
Joel Dudley
5df50c0e81
Fixes a bug in the deserialisation of UniqueIdentifiers in the CRaSH shell.
2018-01-23 17:28:24 +00:00
Thomas Schroeter
a564c9bfd3
Notary metrics ( #383 )
...
* Track the distribution of the number of input states
* Log number of input states and commit duration
...and move the rollback
* Update schema
2018-01-23 16:24:51 +00:00
Michele Sollecito
142f52fa82
[CORDA:936]: Enable RPC layer to work with SSL
2018-01-23 16:23:37 +00:00
Tudor Malene
c81e597199
Fix liquibase files after node split ( #393 )
2018-01-23 15:06:21 +00:00
Anthony Keenan
70f1fdeb2b
CORDA-939 Make SerializationEnvironmentRule.env private so as not to expose internals. ( #2404 )
...
* Make SerializationEnvironment private so as not to expose internals.
* Only expose used parts of api
* Make properties lateinit
* Removing java calls to getEnv
* Initialise properties at declaration
* Tidy up imports
2018-01-23 14:42:30 +00:00
Rick Parker
f628f30098
ENT-1382 JMeter changes to allow easy HTML report generation ( #382 )
...
* Fixes to allow the HTML reports to be run on JMeter CSV output files, with custom label. Also adjust each test plan and examples to include the label.
(cherry picked from commit 35fd309)
* Added some documentation to the README.
2018-01-23 14:00:36 +00:00
Michal Kit
789ce5d44a
Initial implementation of the certificate generation tool ( #148 )
...
* Initial implementation of the certificate generation tool
* Adding trust store persisting
* Addressing review comments
* Adding certificate type to the certificate generation process.
* Addressing review comments
* Fixing typos
* Changing keyOverride to 0 in examples and tests
* Addressing review comments + rebasing
* Adding CRL information to the certificate generation process
* Generation tool refactoring
* Addressing review comments
2018-01-23 11:50:03 +00:00
josecoll
d2795954cb
Merge pull request #379 from corda/colljos-schema-split-for-notaries
...
CORDA-917 Bootstrap nodes without Notary schemas
2018-01-23 09:16:39 +00:00
Christian Sailer
013ac82dde
ENT-1412 flow state machine metrics ( #390 )
...
* re-add metrics for flows started, flows finished and checkpoint rate
Add metric for checkpoint volume rate.
* Put error and success counters in FlowStateMachine
* Optional graphite metrics writer
* Improved checkpoint volume metrics.
* Code review: Clean up/layout.
* Code review: spelling
2018-01-23 09:15:09 +00:00
James Brown
8de2c78dd2
Remove jolokia war reference from webserver
2018-01-22 16:21:28 +00:00
Joel Dudley
443afb3515
Rethrows a clearer error message when a test tx in a test ledger does not create a valid tx.
2018-01-22 16:08:26 +00:00
Viktor Kolomeyko
743f514fd9
High Level Design decisions for Business Network ( #369 )
...
* ENT-1331: Placeholder for design decisions previously discussed.
* ENT-1331: Describe TLS approach.
* ENT-1331: Describe Membership approach.
* ENT-1331: Describe Node vs. CordApp membership approaches.
* ENT-1331: Including remarks/corrections from @josecoll
* ENT-1331: Including remarks/corrections from @josecoll, part 2
2018-01-22 15:33:04 +00:00
josecoll
00a7172e4b
Resolve conflict after merge from master.
2018-01-22 14:39:29 +00:00
josecoll
4bff002b41
Merge branch 'master' into colljos-schema-split-for-notaries
2018-01-22 14:36:27 +00:00
josecoll
c8e55ae086
Backported fix. ( #2399 )
2018-01-22 14:32:04 +00:00
Austin Moothart
642b298d23
AWS marketplace getting started docs
2018-01-22 14:27:35 +00:00
Michal Kit
e1098dee4b
Adding public key constraint ( #319 )
...
* ENT-1356 Adding public key constraint
* Addressing review comments
* Removing SERIALIZABLE from transaction
* Adding stashed changes
* Removing SERIALIZABLE from node info storage
* Addressing review comments
* Addressing possible certificate inconsitency (design gap) + clearing whole database for new liquibase changeset
* Addressing review comments
2018-01-22 14:10:33 +00:00
Christian Sailer
8d5611853a
CORDA-929 Attachment caching ( #2372 )
...
* ENT-1403 Cache node attachments (and attachment content)
* ENT-1403 Make cache sizes configurable
* Update documentation with new config parameters
* Test that non-existence of attachments is not cached
* Remove unneeded defaults in interface
* It turned out we need the defaults on the interface in quite a few tests
* Codereview: typos, size in MB rather than bytes, charset in tests, move concurrencyLevel to a constant
* Codereview: Make the internal config value bytes again, but config file in MB
* Fix example config unit test
2018-01-22 13:41:06 +00:00
Michal Kit
4a3379ac8a
CORDA-937 adding node key pair to utility/testing methods ( #2405 )
2018-01-22 13:06:22 +00:00
Michal Kit
cee975c1c1
Reverting schema changes and following the liquibase change tracking … ( #385 )
...
* Reverting schema changes and following the liquibase change tracking flow
* Addressing review comments
* Adding other tables cleanup
* Renaming the changeset file
2018-01-22 12:11:31 +00:00
Andrzej Cichocki
dfe581bac6
Merge pull request #384 from corda/andr3ej-os-merges
...
OS merges
2018-01-22 11:52:47 +00:00
Andrzej Cichocki
1fc646cfa8
CORDA-716 Move test-utils and node-driver to stable API section in docs ( #2335 )
...
* Move test-utils and node-driver to stable section.
* Move FlowStackSnapshotFactory to testing.services package & update docs
* Move SerializationTestHelpers to testing.core package
* Move TestConstants.kt to core namespace
* Move Expect.kt to core namespace
* Move CoreTestUtils to core.TestUtils - rename class and update imports
* Added some clarification to documents after re-reading them
* Added static imports
* Removing unused import
* Fix merge conflict
* Fixing merge conflict
2018-01-22 11:28:41 +00:00
Andrzej Cichocki
d00438b86f
Fix MockNetwork non-daemon thread leak. ( #2397 )
2018-01-22 11:00:40 +00:00
Patrick Kuo
43604ed212
Handle rejected jira issues in doorman ( #371 )
...
* handle reject status from jira - WIP
* fix up after rebase
* address PR issue and fix build error after rebase
2018-01-22 10:45:25 +00:00
Ross Nicoll
3094e44115
Dump exception to System.err ( #213 )
2018-01-19 22:21:43 +00:00
szymonsztuka
f59560bb06
Database schema changes. ( #2389 )
...
Changes compatible with R3.Corda (ENT-794):
1) Added Hibernate corda-wrapper-binary two to to columns.
2) Shorten names of tables in dummy schemas used in tests.
3) Undo removal of compound index of VaultTxnNote (b423fea
2018-01-19 17:09:02 +00:00
