476 Commits

Author	SHA1	Message	Date
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
Anthony Keenan	f5483d1deb	ENT-1577 - Remove exposure of internal classes via test api (#516) ... * Remove exposures of internal classes via testing api * Remove deleted api from api-current * Fix merge conflict * Remove internal usage from api-current.txt	2018-04-25 11:59:20 +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
Andras Slemmer	67f5bcc38e	Merge commit '640e5c60886b23068162205db82b1ae5c7c7eec8' into aslemmer-merge-640e5c60886b23068162205db82b1ae5c7c7eec8	2018-04-24 11:01:21 +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
Andras Slemmer	ce5fb66260	StateMachine rewrite	2018-04-23 15:36:16 +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
bpaunescu	3a17d4726f	ENT-1775: reworked client to handle failover in HA mode instead of relying on artemis (#759) ... * ENT-1775: reworked client to handle failover in HA mode instead of relying on artemis * ENT-1775: address PR comments	2018-04-22 14:48:16 +01:00
bpaunescu	c0f254e3bb	ENT-1775: reworked client to handle failover in HA mode instead of relying on artemis (#759) ... * ENT-1775: reworked client to handle failover in HA mode instead of relying on artemis * ENT-1775: address PR comments	2018-04-20 10:52:00 +01:00
Shams Asari	b6d43c0204	Merge remote-tracking branch 'open/master' into os-merge-1288f63 ... # Conflicts: # constants.properties # node/src/main/kotlin/net/corda/node/internal/cordapp/CordappConfigProvider.kt # samples/cordapp-configuration/src/main/kotlin/net/corda/configsample/ConfigSampleFlow.kt	2018-04-16 17:35:43 +01:00
Shams Asari	1288f63998	Fixed the CorDapp configuration demo (#2967)	2018-04-16 17:23:11 +01:00
Christian Sailer	a0bf0261bb	Merge commit 'd8bf1019b6c7ddbe709cff7c730e66eb576f9ad5' into christians/merge-CORDA-1336	2018-04-13 16:39:00 +01:00
szymonsztuka	05ec885afd	Update integration test setup in database mode after OS->ENT merge (#732) ... Added Notary schema for SQL setup to tests. Added SQL setup/tearDown to a loop starting the same node few times in DriverTests.	2018-04-13 15:28:07 +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
Shams Asari	45d6bca071	Merge branch 'master' into os-merge-f88542f	2018-04-12 15:14:28 +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
Shams Asari	9b58114146	Merge remote-tracking branch 'open/master' into os-merge-f88542f ... # Conflicts: # docs/source/changelog.rst # finance/src/integration-test/kotlin/net/corda/finance/flows/CashSelectionTest.kt # node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt # testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt	2018-04-11 15:40:25 +01:00
Shams Asari	f88542faa2	CORDA-1095: Fixed rare race where the startNode future completes before the default notary is visible (#2947)	2018-04-11 15:33:55 +01:00
Anthony Keenan	f798c58c36	Merge remote-tracking branch 'open/master' into anthony-os-merge-20180406 ... # Conflicts: # testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt	2018-04-06 11:43:34 +01:00
Rick Parker	130b1d9325	CORDA-1303 Regression: Recording a duplicate transaction attempts sec… (#2935) ... * CORDA-1303 Regression: Recording a duplicate transaction attempts second insert to vault. Added unit test, and merged mock and real logic.	2018-04-06 10:28:51 +01:00
Viktor Kolomeyko	df6c6b99cd	Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge ... # Conflicts: # samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt	2018-04-06 09:19:34 +01:00
Viktor Kolomeyko	d5317e074c	Remove errorLogPath parameter which is not used anyway. (#2934) ... StdErr is always written to working directory if such path specified.	2018-04-05 18:10:47 +01:00
Shams Asari	a97abbc8c0	Merge remote-tracking branch 'open/master' into os-merge-1b37cef	2018-04-05 17:23:03 +01:00
Shams Asari	53a0aae489	Introduced a few helper methods around InputStream.readBytes (#2928)	2018-04-05 14:27:42 +01:00
Shams Asari	6283462548	Merge remote-tracking branch 'open/master' into shams-os-merge-0af42bd ... # Conflicts: # node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt	2018-04-04 14:18:24 +01:00
Viktor Kolomeyko	1f5559e3c4	Speed-up NodeRegistrationTest (#2873) ... * Improve logging for NetworkMap requests * Allow interrupt in polling if the process started successfully * Put `advertiseNewParameters` back * Additional log line to indicate when all the nodes are started * Improve logging and use concurrent map since it is updated from multiple threads * Change NetworkMap response validity duration and rename parameter accordingly * Changes following code review from @shamsasari	2018-04-03 17:33:42 +01:00
sollecitom	89ecfb96c5	Merge remote-tracking branch 'remotes/open/master' into merges/march-29-13-11	2018-03-29 13:12:00 +01:00
renlulu	196a24f030	Optimize imports (#2872)	2018-03-29 11:25:56 +01:00
Shams Asari	71baccf167	Merge remote-tracking branch 'open/master' into os-merge-d2b7f8b	2018-03-28 17:06:15 +01:00
Shams Asari	768dd32417	ENT-1663 - Inclusion of the cert path and root cert in the exception message when cert path validation fails. (#2890) ... Also, added check to node startup that --initial-registration cannot occur in devMode	2018-03-28 15:18:50 +01:00
tudor.malene@gmail.com	a01c9b41e1	Merge remote-tracking branch 'open/master' into merge/tudor-26-03 ... # Conflicts: # testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt	2018-03-26 14:07:28 +01:00
Tudor Malene	7978910e0b	ENT-1633 increase node max heap size to 512m (#2851)	2018-03-26 13:41:37 +01:00
Shams Asari	620ba1e8a2	Integration test for network parameter updates and improved logging (#2863)	2018-03-22 14:08:07 +00:00
szymonsztuka	49146b1cb5	ENT-1634 Fix Primary Key generation for node_notary_request_log table - part 2 (#582) ... * Fix node_notary_request_log table - update Liquibase xml migration * (Unrelated to ENT-1634) Add database SQL setup for several tests to pass database integration tests, update SQL scripts for new tables	2018-03-21 13:49:25 +00:00
Katarzyna Streich	75b467e340	ENT-1433: Implementation of NetworkParameters updates (#477) ... * Implementation of NetworkParameters updates Implementation of NetworkParameters updates for network-management server side of the process. Change the way network parameters are read up on network-management startup. Introduced 3 flags to clearly communicate intentions: initial-network-parameters, update-network-parameters and flag-day. * Address Shams comments * Address comments * NetworkMapStorage refactor getLatestNetworkParameters returns NetworkParametersEntity * TODO Exit after parameters update Started implementing feature requested by devops. TODO: Fix NodeRegistrationTest * Code cleanup * Merged the two cmd line flags into one --set-network-parameters. The idea being to simply check if there are any active network parameters to determine if it's an update or not. Applying network parameters causes the server to exit once done (ENT-1559). * Merge fixes * Minor cleanup * Small fixes * Merge fixes and cleanup * TODO Implementation of cancelUpdate flag Will slightly change after more manual testing * Small cleanup * Address comments Add OneToOne relation between ParametersUpdate and NetworkParameters. * Address comments fix tests	2018-03-21 12:29:27 +00:00
sollecitom	8a561cddbf	Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41 ... # Conflicts: # client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt # node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt # node/src/main/java/CordaCaplet.java # node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt	2018-03-19 15:17:49 +00:00
igor nitto	8591ae2dc9	CordApps back in node classpath (#2843) [CORDA-1232]	2018-03-19 14:34:02 +00:00
Michele Sollecito	7a077e76f0	CORDA-1099: Orchestrated clean shutdown from Shell (#2831)	2018-03-19 14:20:10 +00:00
Shams Asari	327d7d8acf	Added sign helper method to CertificateAndKeyPair for producing SignedDataWithCert objects (#2841)	2018-03-19 12:47:23 +00:00
Andras Slemmer	bb2643cf2e	Add hard restart test ... Remove default async db flush Add in-memory P2P deduplication until we commit the ID persisting tx Add some explaining comments Make scheduled state kickoffs atomic with flow starts	2018-03-16 15:43:20 +00:00
Rick Parker	a71ab3f1a1	ENT-1594 Remove usages of Guava cache. Replace with Caffeine. Added whether message is session initiation or not to cache key for de-duplication to account for the 2 P2P consumers. (#557)	2018-03-15 07:58:28 +00:00
IgorNitto	53509f9a52	Post-merge fixes	2018-03-14 17:33:51 +00:00
IgorNitto	0a0c8538c4	Merge from Corda/OS	2018-03-14 17:24:47 +00:00