ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-15 15:12:46 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
12,609 Commits 96 Branches 407 Tags
Commit Graph

698 Commits

Author SHA1 Message Date
Viktor Kolomeyko
61a8bd0a5a Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge 
# Conflicts:
#	samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
 2018-07-09 16:45:20 +01:00
Michal Kit
408cc68c65
CORDA-1715 Ordering the X500 name for the CRL extension of the TLS certificates (#3515) 
* CORDA-1715 Ordering the X500 name for the CRL extension of the TLS certificate

* Addressing review comments

* Addressing review comments - round 2

* Throwing an exception on incorrect TLS CRL issuer configuration

* Changes after the redesign decisions

* Small refactoring
 2018-07-09 13:45:38 +01:00
Shams Asari
c4d0a62ceb Merge branch 'master' into os-merge-244167d 2018-07-05 15:47:09 +01:00
bpaunescu
06ca40c168
ENT-2204: fixed zookeeper client flaky test (#1198) 
* ENT-2204: fixed zookeeper client flaky test

* ENT-2204: use size of list as count for the countdown latch in zk test

* ENT-2204: store timeout value into a variable

* ENT-2204: tidy up, use lambda outside of parenthesis
 2018-07-05 12:59:46 +01:00
Shams Asari
20a589d66d Merge remote-tracking branch 'open/master' into os-merge-244167d 
# Conflicts:
#	docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt
#	docs/source/example-code/src/main/kotlin/net/corda/docs/LaunchSpaceshipFlow.kt
#	docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/tearoffs/TutorialTearOffs.kt
#	docs/source/running-a-node.rst
#	experimental/behave/build.gradle
#	experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Substeps.kt
#	experimental/kryo-hook/build.gradle
#	experimental/quasar-hook/build.gradle
#	node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
#	node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
#	node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
#	samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
#	samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
 2018-07-04 18:38:34 +01:00
Patrick Kuo
68d0826563
Custom config parser for more complex config structure (#3513) 
* custom config parser for more complex config structure

* address PR issues
 2018-07-04 16:51:54 +01:00
Matthew Nesbit
0d18bf8e33 Merge up of cleanup of AMQP protocol code 2018-07-03 17:05:05 +01:00
Matthew Nesbit
15d868b113 Merge up of cleanup of AMQP protocol code 2018-07-03 17:04:42 +01:00
Matthew Nesbit
d0568121b7
Some code tidy up ahead of post-GA development. (#3500) 
Handle SSL Handshake timeouts properly
 2018-07-03 14:16:31 +01:00
Thomas Schroeter
c32b7b1331 Node API: relocate licence file (#1100) 2018-06-28 10:11:41 +01:00
Thomas Schroeter
eb698160fa Merge remote-tracking branch 'open-source/master' into thomas/os-merge-2018-06-27 2018-06-27 13:00:37 +01:00
Thomas Schroeter
66cb0e389b
Warning timer thread should run as a daemon (#3450) 2018-06-27 12:57:37 +01:00
Michal Kit
d060e95834 Merge OS -> ENT up to e00c7706c3f52d0e338f83d169e60c99d623f1c5 2018-06-26 10:02:33 +01:00
Michal Kit
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
Tudor Malene
9be4c5dca4
CORDA-1567 Remove all traces of the out-of-process verifier (#3424) 2018-06-25 13:01:33 +01:00
Shams Asari
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
Shams Asari
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
tudor.malene@gmail.com
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
Tudor Malene
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
Andrius Dagys
a9cdb576e6 Merge remote-tracking branch 'open/master' into andrius/merge-06-21-2 2018-06-21 14:02:37 +01:00
Katelyn Baker
bafe387e93 Revert "Change to use MDC logic in bridge/AMQP protocol logging (#3398) (#1034)" 
This reverts commit dd74fd2e2832a525a5aaa1976d7cc84c1ba7f361.
 2018-06-21 13:57:44 +01:00
bpaunescu
dd74fd2e28
Change to use MDC logic in bridge/AMQP protocol logging (#3398) (#1034) 2018-06-21 09:37:48 +01:00
gaugfather
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
Matthew Nesbit
4ff5aa34b6 Change to use MDC logic in bridge/AMQP protocol logging (#3398) 2018-06-20 11:55:59 +01:00
rick.parker
3a390e3643 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-201806-15-1 2018-06-15 17:06:09 +01:00
Rick Parker
999ee49804
ENT-2053 Fix messaging TTL related settings causing disconnects (#3384) 
* ENT-2053 Revert RPC TTL due to hanging RPC clients.

* ENT-2053 Set TTL correctly.
 2018-06-15 16:57:49 +01:00
Michal Kit
377d980c99
Fixing filename typo (#3358) 2018-06-14 16:35:42 +01:00
sollecitom
86b34b1227 Merge remote-tracking branch 'remotes/open/master' into merges/june-13-13-27 
# Conflicts:
#	docs/source/changelog.rst
#	docs/source/index.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
 2018-06-13 13:36:31 +01:00
Michal Kit
d97f4f58be
CORDA-1624 updating the DEV certificate with CRL distribution point (#3353) 
* CORDA-1624 updating DEV certificates with CRL distribution points implying R3 owned endpoints

* Keeping old keys but updating certificates
 2018-06-13 12:01:15 +01:00
rick.parker
cb810f0660 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180613-1 
# Conflicts:
#	.idea/compiler.xml
#	build.gradle
#	docs/source/changelog.rst
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
 2018-06-13 11:13:43 +01:00
Tudor Malene
cb50e58367
CORDA-1558 Rename database migration to database management (#979) 
* CORDA-1558 Rename database migration to database management

* CORDA-1558 Address code review comments

* CORDA-1558 Address code review comments

* CORDA-1558 Address code review comments
 2018-06-13 10:52:00 +01:00
Matthew Nesbit
4bf5d809a5
If the Artemis connectionTTL configuration is not set then some of the cleanup actions do not happen on client kill. This prevents durable messages being replayed (#3351) 
and may prevent cleanup of other resources.

Undo spurious code
 2018-06-13 10:32:29 +01:00
Michal Kit
02884e6c81
CORDA-1593 Extracting the whitelist logic and making it public (#3317) 
* CORDA-1539 Extracting the whitelist logic and making it public

* Addressing review comments
 2018-06-12 09:31:06 +01:00
Tudor Malene
8c1c19fdf8
CORDA-1477 add check before db evolution that there are no checkpoints. (#967) 
* CORDA-1477 add check before db evolution that there are no checkpoints.

* CORDA-1477 address code review comments
 2018-06-11 16:24:24 +01:00
tudor.malene@gmail.com
5140d46aa2 Merge remote-tracking branch 'open/master' into tudor-os-merge-7-jun 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
 2018-06-07 16:05:11 +01:00
Tudor Malene
c474c04503
ENT-1837 better error message on db failure (#3318) 2018-06-07 14:05:28 +01:00
tudor.malene@gmail.com
5232c2e0e3 Merge remote-tracking branch 'open/master' into tudor-merge-6-Jun 2018-06-06 13:38:45 +01:00
Tudor Malene
5f2c3d175d
ENT-2036 Handle ClosedChannelException during SSL handshake (#3314) 2018-06-06 13:08:33 +01:00
Mike Hearn
468c0c7404
CORDA-1349: Docs: improve docs on permissioning, doorman and network map. (#3277) 
* Docs: improve docs on permissioning, doorman and network map.

* Add a convenience serialization API for Java users, marked as
internal for now with a TODO to make it public after we start work on
Corda 4.0. Otherwise serializing arbitrary objects to AMQP is awkward.
 2018-06-06 13:57:25 +02:00
Shams Asari
f34a2bd33f Replacing uses of assert with require 2018-06-06 09:56:04 +01:00
Matthew Nesbit
4882e2e089 Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180605 2018-06-05 13:37:35 +01:00
Matthew Nesbit
d86ae5fc0b
I set the max retry time for AMQP at 5 minutes. This is just too long for any kind of sensible testing, so drop back to 1 minute. (#3294) 2018-06-05 10:30:35 +01:00
tudor.malene@gmail.com
eb801d40b8 Merge remote-tracking branch 'open/master' into tudor-merge-os-01_06 
# Conflicts:
#	core/src/main/kotlin/net/corda/core/cordapp/Cordapp.kt
#	core/src/main/kotlin/net/corda/core/internal/cordapp/CordappImpl.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/internal/cordapp/CordappLoader.kt
 2018-06-01 13:56:43 +01:00
Thomas Schroeter
4bc9151d5d
Limit concurrency of the bootstrapper (#3271) 2018-06-01 11:55:46 +01:00
Shams Asari
03fae9bd7d Merge branch 'merge-5d1cc0b' into os-merge-5d1cc0b 
# Conflicts:
#	.idea/compiler.xml
#	node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/transitions/StateMachine.kt
 2018-05-30 21:47:48 +01:00
Shams Asari
7b09795795
CORDA-1383: Cleaned up the JSON format of WireTransaction and SignedTransaction (#3248) 
In particular correctly outputs the custom state and command objects in the txs. Also fixed up deserialisation back into the transaction objects.
 2018-05-30 16:37:41 +01:00
szymonsztuka
37cadbce69 Resolved merge conflicts. 2018-05-30 16:36:06 +01:00
szymonsztuka
ed70fea3a7
CORDA-1548 Hibernate session not flushed before handing over raw JDBC session to user code (e.g. coin selection) (#3266) 
* Hibernate session flushed before handing over raw JDBC session to user code + test - inserting and selecting cash in the same transaction
* Additional two tests copied from Enterprise repo
 2018-05-30 16:19:06 +01:00
Matthew Nesbit
a3c6ef351d Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180530 
# Conflicts:
#	docs/source/changelog.rst
 2018-05-30 11:12:25 +01:00
Matthew Nesbit
74a3c70ee5
Merge pull request #890 from corda/mnesbit-bridge-artemis-reconnect-bug 
ENT-1991: The Bridge Artemis reconnection logic failed in test.
 2018-05-30 11:05:20 +01:00