412 Commits

Author	SHA1	Message	Date
tudor.malene@gmail.com	2ca11d7996	Merge remote-tracking branch 'open/master' into tudor-merge-21-05-18 ... # Conflicts: # .idea/compiler.xml # client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt # client/rpc/src/main/kotlin/net/corda/client/rpc/internal/CordaRPCClientUtils.kt # docs/source/generating-a-node.rst # finance/src/main/kotlin/net/corda/finance/contracts/asset/CommodityContract.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt # node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt # node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt # node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt # node/src/main/kotlin/net/corda/node/internal/Node.kt # node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt # node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt # node/src/main/kotlin/net/corda/node/services/config/SslOptions.kt # node/src/main/kotlin/net/corda/node/services/messaging/RPCMessagingClient.kt # node/src/main/kotlin/net/corda/node/services/rpc/NodeLoginModule.kt # tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt	2018-05-21 13:49:59 +01:00
Tudor Malene	455221629b	CORDA-1343 Make the RPCClient ssl constructors public. Clean up broke… (#3039) ... * CORDA-1343 Make the RPCClient ssl constructors public. Clean up broker authentication logic * CORDA-1343 small fix * CORDA-1343 cleanup * CORDA-1343 fixed api changes script * CORDA-1343 fixed merge * CORDA-1343 removed unused property * CORDA-1343 add separate p2p and rpc node users * CORDA-1343 remove test configuration * CORDA-1343 fix tests * CORDA-1343 address core review comments * CORDA-1343 some documentation and adding createWithSsl method for a haAddressPool * CORDA-1343 clean up the CordaRPCClient interface * CORDA-1343 add internal shell test * CORDA-1343 address code review comments * CORDA-1343 split the internalShell user from the System Rpc user * CORDA-1343 fix test * CORDA-1343 Add warning when certificateChainCheckPolicies is being configured * CORDA-1343 Address code review changes * CORDA-1343 fix merge * CORDA-1343 added test, docs, clarify comments * CORDA-1343 clean up docs * CORDA-1343 fix api * CORDA-1343 fix merge * CORDA-1343 fix merge * CORDA-1343 fix merge * CORDA-1343 fix merge	2018-05-21 13:05:08 +03:00
Shams Asari	152848730d	Merge remote-tracking branch 'open/master' into os-merge-2907250 ... # Conflicts: # build.gradle # client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt # node-api/build.gradle # node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/StringBufferSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/AllButBlacklisted.kt # serialization/src/main/kotlin/net/corda/serialization/internal/AttachmentsClassLoader.kt # serialization/src/main/kotlin/net/corda/serialization/internal/DefaultWhitelist.kt # serialization/src/main/kotlin/net/corda/serialization/internal/GeneratedAttachment.kt # serialization/src/main/kotlin/net/corda/serialization/internal/OrdinalIO.kt # serialization/src/main/kotlin/net/corda/serialization/internal/SerializationFormat.kt # serialization/src/main/kotlin/net/corda/serialization/internal/SerializationScheme.kt # serialization/src/main/kotlin/net/corda/serialization/internal/SerializeAsTokenContextImpl.kt # serialization/src/main/kotlin/net/corda/serialization/internal/SharedContexts.kt # serialization/src/main/kotlin/net/corda/serialization/internal/UseCaseAwareness.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPDescriptorRegistry.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPPrimitiveSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializerFactories.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ArraySerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CollectionSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CorDappCustomSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CustomSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializationInput.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializedGenericArrayType.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializedParameterizedType.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EnumEvolutionSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EnumSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/Envelope.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EvolutionSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/FingerPrinter.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/MapSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ObjectSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertySerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertySerializers.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/Schema.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationHelper.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationOutput.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializerFactory.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SingletonSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SupportedTransforms.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/TransformTypes.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/TransformsSchema.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BigDecimalSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BigIntegerSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BitSetSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/CertPathSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ClassSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ContractAttachmentSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/CurrencySerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/DurationSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/EnumSetSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/InputStreamSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/InstantSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalDateSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalDateTimeSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalTimeSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/MonthDaySerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OffsetDateTimeSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OffsetTimeSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OpaqueBytesSubSequenceSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PeriodSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PrivateKeySerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PublicKeySerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/SimpleStringSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ThrowableSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/X509CRLSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/X509CertificateSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/YearMonthSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/YearSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ZoneIdSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ZonedDateTimeSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenter.kt # serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/Exceptions.kt # serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/MetaCarpenter.kt # serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/Schema.kt # serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/SchemaFields.kt # serialization/src/main/kotlin/net/corda/serialization/internal/kryo/CordaClassResolver.kt # serialization/src/main/kotlin/net/corda/serialization/internal/kryo/CordaClosureSerializer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/kryo/DefaultKryoCustomizer.kt # serialization/src/main/kotlin/net/corda/serialization/internal/kryo/Kryo.kt # serialization/src/main/kotlin/net/corda/serialization/internal/kryo/KryoSerializationScheme.kt # serialization/src/main/kotlin/net/corda/serialization/internal/kryo/SerializeAsTokenSerializer.kt # serialization/src/test/java/net/corda/serialization/internal/ForbiddenLambdaSerializationTests.java # serialization/src/test/java/net/corda/serialization/internal/LambdaCheckpointSerializationTest.java # serialization/src/test/java/net/corda/serialization/internal/amqp/ErrorMessageTests.java # serialization/src/test/java/net/corda/serialization/internal/amqp/JavaGenericsTest.java # serialization/src/test/java/net/corda/serialization/internal/amqp/JavaPrivatePropertyTests.java # serialization/src/test/java/net/corda/serialization/internal/amqp/JavaSerialiseEnumTests.java # serialization/src/test/java/net/corda/serialization/internal/amqp/JavaSerializationOutputTests.java # serialization/src/test/java/net/corda/serialization/internal/amqp/ListsSerializationJavaTest.java # serialization/src/test/java/net/corda/serialization/internal/amqp/SetterConstructorTests.java # serialization/src/test/kotlin/net/corda/serialization/internal/AttachmentsClassLoaderTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/ContractAttachmentSerializerTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/CordaClassResolverTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/ListsSerializationTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/MapsSerializationTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/PrivateKeySerializationTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/SerializationTokenTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/SetsSerializationTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/CorDappSerializerTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeAndReturnEnvelopeTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeMapTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentryOfEnumsTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentrySimpleTypesTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentryTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeSimpleTypesTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializedParameterizedTypeTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumEvolvabilityTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumEvolveTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/ErrorMessagesTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolutionSerializerGetterTesting.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolvabilityTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/FingerPrinterTesting.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/GenericsTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/OverridePKSerializerTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/PrivatePropertyTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/SerializationPropertyOrdering.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/SerializeAndReturnSchemaTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/amqp/StaticInitialisationOfSerializedObjectTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterTestUtils.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterWhitelistTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/CompositeMemberCompositeSchemaToClassCarpenterTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/EnumClassTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/InheritanceSchemaToClassCarpenterTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/MultiMemberCompositeSchemaToClassCarpenterTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/SingleMemberCompositeSchemaToClassCarpenterTests.kt # serialization/src/test/kotlin/net/corda/serialization/internal/kryo/KryoStreamsTest.kt # serialization/src/test/kotlin/net/corda/serialization/internal/kryo/KryoTests.kt # settings.gradle	2018-05-21 10:31:57 +01:00
Katelyn Baker	3778f029df	Merge branch 'master' into kat-merge-20180517	2018-05-18 14:42:05 +01:00
szymonsztuka	18393f27dd	Test doorman with selected dbs only for now (SQL Server and Azure SQL) - for ENT-1447. (#833) ... Test doorman with selected dbs (SQL Server and Azure SQL) only in integration test in database mode since not all databases are supported now.	2018-05-17 16:27:02 +01:00
Shams Asari	3cdd908714	Moved the serialisation logic in nodeapi.internal.serialization into its own module: serialization (#3179) ... node-api now depends on this module and upcoming changes will use this as well rather than having to depend on node-api. EnumEvolveTests.deserializeWithRename and EnumEvolveTests.multiOperations are temporarily ignored since their test resources can't be regenerated due to bugs.	2018-05-17 16:18:07 +01:00
Katelyn Baker	74c5cffd38	Merge remote-tracking branch 'open/master' into kat-merge-20180517	2018-05-17 15:04:51 +01:00
Kat Baker	f850daa582	CORDA-847 - AMQP RPC ... * Client and server support for amqp * Observable (and supporting) serialisers Unit Tests * Fixing tests * Test fixes * CORDA-847 - Update api doc with additon of @CordaSerializable annotation * TestFixes * review comments * TestFixes * Test Fix * Test Fix * Test Fix * Test Fix * Test Fix * Test Fix * TestFix * Test Fix * Review Comments	2018-05-17 12:53:38 +01:00
josecoll	a797c693fb	Sync api-current.txt file. ... Add missing JvmStatic annotation.	2018-05-17 10:59:49 +01:00
josecoll	b998901da4	Align API signature with OS.	2018-05-16 18:21:10 +01:00
josecoll	0cc1b5f4b9	Merge remote-tracking branch 'open/master' into colljos-merge-160518 ... # Conflicts: # testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt	2018-05-16 18:20:22 +01:00
josecoll	27803cdc9e	ENT-1887 Make sure open and enterprise API are identical (#3158) ... * Sync public API's (and associated internal helpers) between Enterprise and OS. * Add previous default constructor explicitly. * Keep the API checker happy! * Revert addition of ENT makeTestDataSourceProperties() function.	2018-05-16 18:01:53 +01:00
Thomas Schroeter	23a0a66128	Merge remote-tracking branch 'open-source/master' into thomas-merge-3d50e73271cb3bbd95822575349995c9771729dd	2018-05-16 15:30:46 +01:00
Thomas Schroeter	3d50e73271	Add configuration notary.serviceLegalName for clustered notaries	2018-05-16 15:19:14 +01:00
Katarzyna Streich	24fa695ca0	CORDA-866: Implement removal of stale nodes from network - backport (#3128) ... * CORDA-866: Implement removal of stale nodes from network Backported * Implement removal of stale nodes from network Add eventHorizon to NetworkParameters structure. Add republishing of node info on 1 day intervals - it is treated by network map as heartbeat from node indicating if it's alive or not. Add removal of old node infos on network map signing. * Add copy method to NetworkParameters data class Add JvmOverloads annotation to the constructor, because it's data class exposed in API * Fix test	2018-05-15 12:10:04 +01:00
sollecitom	dc1bf3ad34	Merge remote-tracking branch 'remotes/origin/tudor_merge_14_05_2018' into merges/may-14-15-21 ... # Conflicts: # testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt	2018-05-14 17:19:51 +01:00
Tudor Malene	a1616767b8	Fix merge	2018-05-14 17:17:48 +01:00
sollecitom	61245c9675	Fixed copy names in Driver.	2018-05-14 16:40:09 +01:00
Tudor Malene	ec20359518	Fix merge	2018-05-14 16:05:30 +01:00
sollecitom	9a69a36904	Merge remote-tracking branch 'remotes/open/master' into merges/may-14-15-21 ... # Conflicts: # .idea/compiler.xml # constants.properties # experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt # experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt # experimental/behave/src/test/kotlin/net/corda/behave/service/PostreSQLServiceTests.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/HibernateConfiguration.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt # node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt # node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt # node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt # node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt # node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt # node/src/main/kotlin/net/corda/node/services/persistence/AbstractPartyToX500NameAsStringConverter.kt # node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt # node/src/main/kotlin/net/corda/node/utilities/AddOrRemove.kt # node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt # samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt # samples/irs-demo/web/src/test/kotlin/net/corda/irs/web/IrsDemoWebApplicationTests.kt # samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt # testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt # testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeConfig.kt # webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt	2018-05-14 15:56:43 +01:00
tudor.malene@gmail.com	9b42dd3a87	Merge branch 'tudor_os_merge' into tudor_merge_14_05_2018 ... # Conflicts: # constants.properties # node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt # node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt # testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt	2018-05-14 15:20:14 +01:00
Michele Sollecito	d027b5b8f2	[CORDA-1472]: Crackdown on warnings. (#3136)	2018-05-14 21:15:52 +07:00
Tudor Malene	543491c7df	CORDA-1461 improve devMode (#3100) ... * CORDA-1461 improve devMode * CORDA-1461 set devMode=true for driver * CORDA-1461 fix tests and improve UI * CORDA-1461 Address code review changes * CORDA-1461 Missing developer emoji * CORDA-1461 use latest cordform that sets devMode=true * CORDA-1461 fix test and add driver overrides for notary * CORDA-1461 fix tests, fix api-scanner version * CORDA-1461 fix api * CORDA-1461 formatting * CORDA-1461 comment style	2018-05-11 17:48:02 +01:00
Katarzyna Streich	509a52ad5e	CORDA-866: Implement removal of stale nodes from network (#774) ... * Implement removal of stale nodes from network Add eventHorizon to NetworkParameters structure. Add republishing of node info on 1 day intervals - it is treated by network map as heartbeat from node indicating if it's alive or not. Add removal of old node infos on network map signing. * Add copy method to NetworkParameters data class Add JvmOverloads annotation to the constructor, because it's data class exposed in API	2018-05-11 17:11:56 +01:00
cburlinchon	1c2d6d8100	Unrevert artemis upgrade to 2.5.0 (#3029) (#815) ... * Revert "Revert "artemis upgrade to 2.5.0 (#3029)""	2018-05-10 10:01:37 +01:00
Katelyn Baker	406cdf39bb	Merge remote-tracking branch 'open/master' into kat-merge-20180508	2018-05-08 12:10:22 +01:00
Mike Hearn	0784f079ed	Revert "OS merge (#806)" ... This reverts commit 5c0775f7b41561792c2590f6abee4e2d95e430dc.	2018-05-04 16:09:11 +01:00
cburlinchon	5c0775f7b4	OS merge (#806)	2018-05-04 15:47:36 +01:00
Shams Asari	a772884d48	CORDA-1030 - allow nodes to be waited for in-process (#2678) (#3070) ... (cherry picked from commit 53bb986)	2018-05-03 17:48:49 +01:00
Roger Willis	db22c5259d	Feature to exclude CorDapps from specific MockNodes in a MockNetwork. (#3028) ... * Feature to exclude CorDapps from specific MockNode's in a MockNetwork. * Fixed API stability issue. * * Added docs. * Changed approach for the new parameter to be additive as opposed to exclusive. * * Updated incorrect comments.	2018-05-03 15:39:52 +01:00
Andrius Dagys	855f89b61e	Merge remote-tracking branch 'open/master' into andrius/os-merge	2018-05-03 13:37:39 +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
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
Maksymilian Pawlak	29615f512e	Close DB after test ... Add unique node prefix to DB source	2018-05-01 14:37:35 +01:00
bpaunescu	c3e6b39e59	artemis upgrade to 2.5.0 (#3029)	2018-04-27 19:54:08 +01:00
szymonsztuka	df5d45a4a6	Enable integration tests to run doorman against remote database (part of ENT-1447) (#776) ... Change integration tests in remote database mode infrastracture to allow passing parameterised dataSource configuration to doorman. Add doorman tables to SQL clearup scripts.	2018-04-27 09:57:16 +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
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
Andras Slemmer	67f5bcc38e	Merge commit '640e5c60886b23068162205db82b1ae5c7c7eec8' into aslemmer-merge-640e5c60886b23068162205db82b1ae5c7c7eec8	2018-04-24 11:01:21 +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
Christian Sailer	a0bf0261bb	Merge commit 'd8bf1019b6c7ddbe709cff7c730e66eb576f9ad5' into christians/merge-CORDA-1336	2018-04-13 16:39:00 +01:00