722 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
szymonsztuka	013eb33d7c	ENT-1574 Progress tracker distinguishes steps which were not processed (#3173) ... * Progress Tracker doesn't mark as "green tick" a step which hasn't been set in the flow. Steps behind the current step, which were not processed ('an optional step') are now marked distingishly as green crossed sign for shell and as minus sign for ssh. * Finality Flow sets the current step to NOTARISING only if the actual notarization is performed.	2018-05-18 16:39:55 +01:00
Katelyn Baker	3778f029df	Merge branch 'master' into kat-merge-20180517	2018-05-18 14:42:05 +01:00
Andrius Dagys	1c575b5364	Tool for prototyping and load testing notary implementations (#823)	2018-05-17 20:02:19 +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
Katelyn Baker	bbc80429be	Merge pull request #3072 from corda/kat/feature/amqp-rpc ... CORDA-847 - AMQP RPC	2018-05-17 13:54:43 +01:00
Kat Baker	0c3a30edc8	Corda-847 - Remove Kryo for RPC ... It's no longer used as we've switched over to AMQP for RPC calls so remove it from everywhere and only use it for checkpointing * Wire up demo bench post Kryo removal * Test Fixes * rebase and fix tests * Test Fix * wip * revert changes to api now we don't need to add annotations	2018-05-17 12:55:45 +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
Chris Rankin	d09e9383e6	Fix build breakage with Gradle 4.7. (#3178)	2018-05-17 12:50:46 +01:00
Thomas Schroeter	23a0a66128	Merge remote-tracking branch 'open-source/master' into thomas-merge-3d50e73271cb3bbd95822575349995c9771729dd	2018-05-16 15:30:46 +01:00
Andrzej Cichocki	65b782c206	ENT-933 Add spectator and participant profiles of rigorousMock (#3157)	2018-05-16 13:56:41 +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
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
Viktor Kolomeyko	e0dfe7a75a	Compilation fixes after OS merged.	2018-05-10 16:12:32 +01:00
Viktor Kolomeyko	355c65ad62	Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/os-merge ... # Conflicts: # node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/SharedContexts.kt # node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt # tools/explorer/src/main/kotlin/net/corda/explorer/views/SearchField.kt # tools/explorer/src/main/kotlin/net/corda/explorer/views/TransactionViewer.kt	2018-05-10 15:36:07 +01:00
Viktor Kolomeyko	15e87050c7	CORDA-1393: Make Explorer GUI recover on RPC connection loss. (#3093) ... * CORDA-1393: Install `onError()` handler for folding action or else `ErrorNotImplementedAction` will be invoked which is never a good thing * CORDA-1335: Improve exception handling in `cleanUpOnConnectionLoss()` * CORDA-1335: Try to trick the logic to pretend we are running in HA mode to have a chance of re-connecting. * CORDA-1416: Make `NodeMonitorModel` code react to proxy changing. * CORDA-1416: Workaround `CordaRPCOps.equals()` calls when listener dispatching change. * CORDA-1416: Increase re-try interval to allow enough time for server to come back online. * CORDA-1355: Properly close RPC connection we are moving away from. * CORDA-1355: Unsubscribe on Error to prevent propagation of it downstream. * CORDA-1355: For downstream subscribers ignore errors properly. Thanka to @exfalso for the hint. This fixes: Transaction Updates do not flow after re-connect * CORDA-1355: Bugfix eliminate duplicating items on "Transactions" blotter after re-connect. * CORDA-1355: Bugfix eliminate double counting on dashboards. * CORDA-1355: Bugfix eliminate same parties in dropdowns. * CORDA-1355: Stop using `SecureHash.randomSHA256()` for painting widget icon. Instead use combined SHA hash such that icon represents the whole population of trades. That way two transactions blotters can be compared by a single glimpse at corresponding icons. Also minor refactoring. * CORDA-1416: Make RPC re-connection faster/more robust. * CORDA-1416: Properly announce thet Proxy may not be available during re-connect and prevent UI crashing. * CORDA-1416: Disable UI until RPC proxy is available. * CORDA-1416: Correct typo. * CORDA-1416: Unit test fix. * CORDA-1416: GUI cosmetic changes. * CORDA-1416: Correct spaces. * CORDA-1416: Remove un-necessary overrides in CordaRPCOpsWrapper. * CORDA-1416: Switch from using `doOnError` to installing an error handler upon subscription.	2018-05-10 15:20:41 +01:00
bpaunescu	b4a402de36	Merge remote-tracking branch 'open/master' into bogdan-merge-10-05-18	2018-05-10 09:47:54 +01:00
Shams Asari	3bb95c3ed1	Cleanup and improvements to the serialisation format of JacksonSupport (needed for CORDA-1238) (#3102) ... Also deprecated all the public members that shouldn't have leaked into the public API.	2018-05-09 21:42:55 +01:00
Andrius Dagys	855f89b61e	Merge remote-tracking branch 'open/master' into andrius/os-merge	2018-05-03 13:37:39 +01:00
Chris Rankin	a6b7257491	CORDA-1441: Upgrade to Kotlin 1.2.41 (#3063)	2018-05-03 12:12:54 +01:00
Michal Kit	e5e98f3540	Merge OS commit 'ab80df342ab8a7ede0539daaee9fcecd02f6aeeb' into enterprise	2018-05-03 10:55:40 +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
Tudor Malene	772061bab5	Merge pull request #793 from corda/feature/ENT-1823/publish_migration_tool ... ENT-1823 Publish migration tool	2018-04-30 17:42:23 +01:00
Andrzej Cichocki	2a37ce438a	ENT-1831 Delete notaryhealthcheck which is now in CC (#791)	2018-04-30 17:23:59 +01:00
tudor.malene@gmail.com	e49fbaa956	ENT-1823 Publish migration tool	2018-04-30 15:41:03 +01:00
Christian Sailer	e62d1f12c1	DEVOPS-663 Publishing of performance test artefacts (#769) ... * Enable publishing of perftest cordapps * Enable publishing of jmeter-corda as capsule jar * Enable publishing of jmeter-corda as capsule jar * jar name * Correct module name to publish	2018-04-30 14:41:55 +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
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
Patrick Kuo	99129c1141	Merge pull request #3010 from corda/pat/explorer-networkview-bugfix ... [Bug fix] - explorer doesn't remove node from network view.	2018-04-26 16:52:21 +01:00
Michele Sollecito	033fc3cf7b	[CORDA-1342]: The shell doesn't print the return value of a started flow - fixed. (#3007)	2018-04-26 22:51:23 +07:00
Patrick Kuo	1b31574512	[Bug fix] - explorer doesn't remove node from network view. (#779) ... (cherry picked from commit eb5b03e)	2018-04-26 13:23:16 +01:00
Patrick Kuo	eb5b03e2f5	[Bug fix] - explorer doesn't remove node from network view. (#779)	2018-04-26 13:19:06 +01:00
Mike Hearn	f99d16eebb	Merge remote-tracking branch 'open/master' into mike-merge-4cfb1606da	2018-04-25 10:43:23 +02:00
Chris Rankin	3fb3371d52	Upgrade DemoBench to TornadoFX 1.7.15 (for Kotlin 1.2). (#2998)	2018-04-24 19:50:43 +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	fc3dde9f66	Merge pull request #767 from corda/os-merge-d3446e2 ... O/S merge from d3446e2	2018-04-23 17:10:32 +01:00
Rick Parker	51df3872b2	ENT-1791 Stop performance tests returning whole transactions (#752)	2018-04-23 16:55:55 +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
Tudor Malene	241f7738e4	ENT-1704 restructure db migration documentation (#636)	2018-04-11 16:48:25 +01:00
Tudor Malene	aaf3bdacd5	ENT-1698 - transform baseDirectory to an absolute path (#714)	2018-04-11 10:41:31 +01:00
Tudor Malene	4ed917436a	CORDA-1309 Add support for jarDirs config (#705)	2018-04-10 11:24:35 +01:00
Viktor Kolomeyko	375b4638ba	Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/ent-master-merge ... # Conflicts: # node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt # node/src/integration-test/kotlin/net/corda/node/persistence/NodeStatePersistenceTests.kt	2018-04-05 13:12:13 +01:00
Michele Sollecito	54db391e3c	[CORDA-1294]: Fix corda-shell publication. (#2926)	2018-04-05 11:53:12 +01:00
Matthew Nesbit	689aeac0e5	Add jmeter files required for testing bridge environment.	2018-04-03 17:08:35 +01:00