2547 Commits

Author SHA1 Message Date
bpaunescu
71d8586e61
ENT-1962: throw a clearer exception when starting RPC flow while SMM is stopped … (#912)
* ENT-1962: throw a clearer exception when starting RPC flow while SMM is stopped.

* ENT-1962: update exception constructor
2018-06-04 10:14:53 +01:00
Michele Sollecito
7350cd9d1e
[CORDA-1408]: Fixed some Demobench bugs. (#3288) 2018-06-04 09:35:38 +01:00
josecoll
76644e0d00
ENT-1871 Rebrand R3Corda to Corda Enterprise (#907)
* Final part of rebranding exercise.

* Fix test.
2018-06-02 10:47:31 +01:00
Tudor Malene
0ecacb894e Fix merge 2018-06-01 17:14:27 +01:00
Michele Sollecito
fc020bca4b
[CORDA-1575]: Out of process nodes started by the driver do not log to file (fix). (#3286) 2018-06-01 16:16:23 +01:00
szymonsztuka
57d379597b
Fix a typo in node_attchments_contracts table name. (#3202) 2018-06-01 16:08:19 +01:00
Rick Parker
609c313496
CORDA-1564 Remove old sessions on flow retry from multi-threaded SMM (#906) 2018-06-01 15:38:09 +01:00
Tudor Malene
6dc778e404 Fix merge 2018-06-01 14:28:23 +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
Tudor Malene
9efb1ecfe0
CORDA-1477 add check for code version in checkpoints (#3256)
* CORDA-1477 add check for code version in checkpoints

* CORDA-1477 Comment style

* CORDA-1477 address code review comments

* CORDA-1477 add changelog entry

* CORDA-1477 attempt to fix tests

* CORDA-1477 attempt to fix tests and address code review comments

* CORDA-1477 attempt to fix tests
2018-06-01 13:37:39 +01:00
sollecitom
c0ddb0b026 Merge remote-tracking branch 'remotes/open/master' into merges/may-31-19-04
# Conflicts:
#	docs/source/network-map.rst
2018-05-31 19:06:28 +01:00
Rick Parker
51c359c48d
CORDA-1564 Clean up old sessions when retrying flows. (#3278) 2018-05-31 18:43:50 +01:00
Shams Asari
1feeda7d3b Merge remote-tracking branch 'open/master' into os-merge-34a480d 2018-05-31 17:45:06 +01:00
Shams Asari
34a480d7e3
Move checkPayloadIs out of the public API (#3279) 2018-05-31 17:40:49 +01:00
cburlinchon
675059bfa8
System.exit node if artemis is closed (#898) 2018-05-31 15:08:46 +01:00
Katarzyna Streich
509b556807 Merge branch 'master' into kstreich-OS-ENT-merge-310518 2018-05-31 11:48:02 +01:00
Shams Asari
27e688e2c8
Merge pull request #895 from corda/os-merge-5d1cc0b
O/S merge from 5d1cc0b
2018-05-31 11:14:15 +01:00
rick.parker
6f30225f65 Remove redundant SessionDeliverPersistenceStrategy 2018-05-31 09:59:42 +01:00
Tudor Malene
fd2f2eb14a ENT-1871 Rebrand R3Corda to Corda Enterprise (#838)
* ENT-1871 Rebrand R3Corda to Corda Enterprise

* ENT-1871 Address code review comments

* ENT-1871 Address code review comments

* ENT-1871 Address code review comments

* ENT-1871 Address code review comments
2018-05-31 08:59:05 +01:00
rick.parker
6fef4c86d3 Update configuration files to remove references to StateMachineConfiguration 2018-05-31 08:56:37 +01:00
rick.parker
b43e09a939 Update configuration files to remove references to StateMachineConfiguration 2018-05-31 08:52:48 +01:00
Shams Asari
78a5c708d2 Merge fixes 2018-05-31 00:20:32 +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
Katarzyna Streich
3758dbea34
CORDA-1493: add --clear-network-map-cache command line option (#3272)
CORDA-1493: add --clear-network-map-cache command
2018-05-30 18:39:27 +01:00
Rick Parker
ef2772e328
CORDA-1540 Remove no-longer-used StateMachineConfiguration (#3270) 2018-05-30 17:06:36 +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
Matthew Nesbit
86b4086b37
Merge pull request #892 from corda/mnesbit-merge-20180530
Merge from OS
2018-05-30 13:39:55 +01:00
szymonsztuka
d377f14ac3 Upgrade integration test introduced by CORDA-1465 to run in database mode (#887) 2018-05-30 11:31:22 +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
szymonsztuka
0a4d98161a CORDA-1266 When a cash output is identical only the fist output is saved. (#3244) 2018-05-30 10:49:44 +01:00
Michele Sollecito
df928f6f2a
Merge pull request #889 from corda/merges/may-29-16-48 2018-05-30 10:37:34 +01:00
Stefano Franz
7c8038f388
Merge pull request #888 from roastario/add_post_process_tarballing_task
add post process step to build tarball from node distribution
2018-05-30 10:03:52 +01:00
sollecitom
afdfd983e7 Fixed some compilation errors. 2018-05-29 17:19:37 +01:00
sollecitom
0b753969ee Fixed some compilation errors. 2018-05-29 17:19:16 +01:00
sollecitom
de0c69a888 Merge remote-tracking branch 'remotes/open/master' into merges/may-29-16-48
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/services/identity/PersistentIdentityService.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt
#	node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
#	node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
#	node/src/test/kotlin/net/corda/node/services/identity/PersistentIdentityServiceTests.kt
#	node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/DBTransactionStorageTests.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentStorageTest.kt
#	node/src/test/kotlin/net/corda/node/services/schema/HibernateObserverTests.kt
#	node/src/test/kotlin/net/corda/node/services/transactions/PersistentUniquenessProviderTests.kt
#	node/src/test/kotlin/net/corda/node/services/transactions/RaftTransactionCommitLogTests.kt
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
#	node/src/test/kotlin/net/corda/node/utilities/ObservablesTests.kt
#	samples/irs-demo/cordapp/src/test/kotlin/net/corda/irs/api/NodeInterestRatesTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-05-29 17:17:08 +01:00
Stefano Franz
3e9c6f0f96 add post process step to build tarball from node distribution 2018-05-29 16:45:28 +01:00
Michele Sollecito
f68cf6f712
[CORDA-1341]: Ensure API can be called concurrently wrt transactions. (#3235) 2018-05-29 15:25:34 +01:00
Shams Asari
0f82e2df7f
Explicitly check the contractStateType param of the RPC vault queries is a ContractState class. (#3251)
We lose the compile-time checks of the Class type parameter when invoking from the shell.
2018-05-29 15:01:55 +01:00
rick.parker
34a9a7aa05 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180529-1 2018-05-29 14:21:53 +01:00
szymonsztuka
ab97ae252d
Merge pull request #883 from corda/merges/os-2017-05-29
OS merge up to 2017-05-28
2018-05-29 12:53:56 +01:00
Christian Sailer
6791ea800d CORDA-1524 Fix NodeSchedulerService (#3238)
* Simplify flow scheduler

* Fix mutex and count up on the unfinished flows latch

* Fix missing import

* Some code layout shifting

* Undo automated change

* minor format changes from code review.

* Fix up tests to work with changes to scheduler

* Formatting fixes

* Remove commented out line.

* Fix race condition.

* We were not waiting for the scheduler to stop, or indeed stopping it.
2018-05-29 12:20:30 +01:00
szymonsztuka
99d4d92ae2
Added Liquibase migration schema file for DummyTestSchemaV1 introduced by ENT-1932 to fix integration tests in database mode. (#878)
Added Liquibase migration schema file for DummyTestSchemaV1 for IntegrationTest - when running integration tests against remote database schema migration is on and needs the missing file, a table renamed to avoid clash with another one from a dummy schema.
2018-05-29 12:10:11 +01:00
szymonsztuka
c6168cb4e6 Resloved merge conflicts. 2018-05-29 11:32:43 +01:00
Maksymilian Pawlak
7d69bc664a [CORDA-1297] Columns nullability (#3112)
JPA/Hibernate entities need to impose the correct NULL/NOT NULL constraints on the database - whatever these correct values actually are.
API change: net.corda.core.schemas.PersistentStateRef fields (index and txId) are now non-nullable. Rationale: The fields were always effectively non-nullable - values were set from non-nullable fields of other objects. The class is used in context of database table Primary Key of for other entities and a database already imposes those columns as non-nullable (even if JPA annotation nullable=false was absent).
2018-05-25 19:03:24 +02:00
Katarzyna Streich
8504b65e7b
ENT-1933: make NetworkParameters serialization compatible (#3234)
* ENT-1933: make NetworkParameters serialization compatible
2018-05-25 17:14:00 +01:00
rick.parker
028b4f73d9 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180525-1 2018-05-25 15:51:26 +01:00
rick.parker
c830d50647 Enterprise changes for OS merge. 2018-05-25 15:50:44 +01:00
Rick Parker
5e14277770
Add back import. (#3237) 2018-05-25 15:47:01 +01:00
rick.parker
033a5798a1 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180525-1
# Conflicts:
#	.idea/compiler.xml
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/DatabaseTransaction.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/services/network/NetworkMapTest.kt
#	node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/transitions/DeliverSessionMessageTransition.kt
#	node/src/main/resources/reference.conf
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
#	settings.gradle
2018-05-25 14:19:15 +01:00
Rick Parker
59fdb3df67
CORDA-1475 CORDA-1465 Allow flows to retry from last checkpoint (#3204) 2018-05-25 13:26:00 +01:00