c77a75bc10
[CORDA-1937]: Fixes to enterprise float and bridge.
2018-09-04 11:28:21 +01:00
31e58dd2e5
[CORDA-1937]: Fixes to enterprise float and bridge.
2018-09-04 11:20:34 +01:00
fbaa31e9d2
Merge remote-tracking branch 'open/master' into os_ent_merges/CORDA-1937
...
# Conflicts:
# client/rpc/src/main/kotlin/net/corda/client/rpc/internal/CordaRPCClientUtils.kt
# core/src/main/kotlin/net/corda/core/internal/InternalUtils.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/BridgeControlListener.kt
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.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/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
2018-09-04 11:07:50 +01:00
d01dd22419
[CORDA-1937]: Refactor NodeConfiguration hierarchy. ( #3856 )
2018-09-04 10:26:10 +01:00
97aef9c8a1
Merge remote-tracking branch 'open/master' into mike-merge-f6ee263db10
2018-09-03 20:13:38 +02:00
33f5aa4190
RPC: make the client library require the platform version it is built for.
...
Remove an unnecessary override on the CordaRPCOps interface.
2018-09-03 19:05:47 +02:00
0f8a6e44ea
RPC: allow trackRpcCallSites to be set from the command line. Add logging.
2018-09-03 19:05:47 +02:00
c3c245e7ac
Fix codestyle
2018-09-03 18:58:16 +02:00
643ad31736
Add tests to confirm that if a Hibernate error occurs the transaction will fail and no states will be persisted
...
Add tests to NodeVaultServiceTest
Add VaultFlowTest
Add UniqueDummyFungibleContract and UniqueLinearContract to be used in the constraint tests
2018-09-03 18:58:16 +02:00
11e2bef240
ENT-2473: Removed copyright headers ( #1364 )
2018-09-03 16:38:52 +01:00
793a52c57a
[CORDA-1542]: Exception error codes aren't stable (fixed). ( #3887 )
2018-09-03 14:27:24 +01:00
91dfa277e3
CORDA-1938 adding VersionInfo to the node info submission ( #3886 )
2018-09-03 14:04:36 +01:00
f22d9ad411
CORDA-1938 Adding version info to the node info submission request ( #3854 )
2018-08-31 09:34:42 +01:00
b98f91ee61
Merge remote-tracking branch 'remotes/origin/master' into feature/ENT-2253-NonStop-changes
...
# Conflicts:
# node/src/main/resources/migration/node-info.changelog-master.xml
# node/src/main/resources/migration/node-info.changelog-v3.xml
2018-08-30 15:51:38 +01:00
dbc1088417
CORDA-1939 Regression: Liquibase fails to migrate existing pre-liquibase database ( #3855 )
...
* Bugfix for corda.jar manually deployed without coping the matching corda-finance-VERSION.jar.
If the older finance cordapp version is detected (which doesn't have Liquibase migration scripts) fail node at startup and print message: "Could not create the DataSource: Detected incompatible corda-finance cordapp without database migration scripts, replace the existing corda-finance-VERSION.jar with the latest one."
Since coda-finance is an optional cordapp,the presence of Liquibase scripts is only checked if corda-finance-VERSION.jar is present in cordapps folder.
* Allow to start using Liquibase from any point of 4.0-SNAPSHOT before Liquibase was introduced (not only from 3.0/3.X versions) - 2 database changes introduced after 3.2 but before Liquibase are now conditional database changes.
2018-08-30 13:40:02 +01:00
bdc12341cb
Restore ENT-only logic clobbered in merge
2018-08-30 11:45:57 +01:00
f061235cc8
Resolve merge conflict
2018-08-30 10:47:56 +01:00
7ead9e5698
ENT-2293 & ENT-2353: Basic implementation of an RPC worker and Flow Worker ( #1308 )
2018-08-29 13:45:27 +01:00
43f7b8477e
Merge commit 'bc330bd9890d41904bbeea6e579f5fc4438872b6' into christians/merge-ENT-2414
2018-08-28 12:26:57 +01:00
36bfe268af
Revert back to using "relevancy" as "modifiable" states are not permissible by definition on an immutable ledger. ( #3847 )
2018-08-28 11:04:40 +02:00
bc330bd989
ENT-2414 Named caches ( #3848 )
...
* Add named caches and apply to NonInvalidingUnboundCache and all usages.
* Add named caches and apply to NonInvalidingCache and all usages.
* Add named caches and apply to NonInvalidingWeightBasedCache and all usages.
* Move NamedCache to core/internal
* Remove type `NamedCache` and `NamedLoadingCache`
* Suppressed 'name not used' warning, added comment, and fixed generic parameters on the buildNamed functions.
* Use `buildNamed` in all caffeine instances in production code. Not using it for caches that are created in test code.
* Add checks for the cache name
* Formatting
* Minor code review revisions
2018-08-24 17:17:22 +01:00
3594ccd89b
CORDA-1924: Remove references to Cordform definition and cordform-common ( #3842 )
2018-08-24 16:29:14 +01:00
33e8e05a8d
Fixes after merge remote-tracking branch 'remotes/open/master' into szymonsztuka/os-merge-20180824
2018-08-24 13:24:43 +01:00
c7f666102f
Fixes after merge remote-tracking branch 'remotes/open/master' into szymonsztuka/os-merge-20180824
2018-08-24 12:27:47 +01:00
598e3a327a
Merge remote-tracking branch 'remotes/open/master' into szymonsztuka/os-merge-20180824
...
# Conflicts:
# build.gradle
# core/src/main/kotlin/net/corda/core/schemas/PersistentTypes.kt
# finance/src/main/kotlin/net/corda/finance/schemas/CashSchemaV1.kt
# finance/src/main/kotlin/net/corda/finance/schemas/CommercialPaperSchemaV1.kt
# finance/src/main/resources/migration/cash.changelog-init.xml
# finance/src/main/resources/migration/cash.changelog-master.xml
# finance/src/main/resources/migration/commercial-paper.changelog-init.xml
# finance/src/main/resources/migration/commercial-paper.changelog-master.xml
# finance/src/main/resources/migration/commercial-paper.changelog-v1.xml
# node-api/src/main/kotlin/net/corda/nodeapi/internal/MigrationHelpers.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/SchemaMigration.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/schemas/NodeInfoSchema.kt
# node/src/main/kotlin/net/corda/node/services/persistence/DBCheckpointStorage.kt
# node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt
# node/src/main/resources/migration/common.changelog-init.xml
# node/src/main/resources/migration/common.changelog-master.xml
# node/src/main/resources/migration/node-core.changelog-init.xml
# node/src/main/resources/migration/node-core.changelog-master.xml
# node/src/main/resources/migration/node-core.changelog-pkey.xml
# node/src/main/resources/migration/node-core.changelog-postgres-blob.xml
# node/src/main/resources/migration/node-core.changelog-tx-mapping.xml
# node/src/main/resources/migration/node-core.changelog-v3.xml
# node/src/main/resources/migration/node-core.changelog-v4.xml
# node/src/main/resources/migration/node-info.changelog-init.xml
# node/src/main/resources/migration/node-info.changelog-master.xml
# node/src/main/resources/migration/node-info.changelog-v1.xml
# node/src/main/resources/migration/node-info.changelog-v2.xml
# node/src/main/resources/migration/node-notary.changelog-init.xml
# node/src/main/resources/migration/node-notary.changelog-master.xml
# node/src/main/resources/migration/node-notary.changelog-pkey.xml
# node/src/main/resources/migration/node-notary.changelog-v1.xml
# node/src/main/resources/migration/vault-schema.changelog-init.xml
# node/src/main/resources/migration/vault-schema.changelog-master.xml
# node/src/main/resources/migration/vault-schema.changelog-pkey.xml
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-08-24 12:23:30 +01:00
793a937482
Merge pull request #1355 from corda/tlil/os-merge-20180823
...
OS->ENT merge 20180823
2018-08-23 17:49:50 +01:00
c4f33ef533
Rename column HOST to HOST_NAME in table NODE_INFO_HOSTS - required by ENT-2253
2018-08-23 17:08:05 +01:00
487cad7d06
CORDA-1471 Database schema setup for internal tables via Liquibase ( #3815 )
...
Internal tables (the tables from node and finance modules) are now tracked /created by Liquibase script.
Tables backing MappedSchemma in Cordapps are created by Hibernate (as before).
The PR scope added Liquibase library, setup code SchemaMigration and XML scripts and from Enterprise.
For existing database installation - the node will auto-upgrade to use Liquibase.
Method migrateOlderDatabaseToUseLiquibase checks for any 3.X existing Corda database to upgrade database to use Liquibase. When the existing database without Liquibase integral tables is detected, the node (at startup) will create Liquibase tracking tables and fill them with all migration scripts (marked as done), this ensure the database will look as it would use Liquibase from the beginning.
The database changes gradually introduced by the subsequent 3.X releases (3.1, 3.2) are conditionally run by Liquibase.
2018-08-23 16:30:02 +01:00
79909a5ea9
ENT-2430 Swap over output_index and transaction_id in database indexes ( #1354 )
...
(cherry picked from commit 2d33ba3)
2018-08-23 16:24:56 +01:00
acd3f44181
Merge remote-tracking branch 'open/master'
2018-08-23 13:55:11 +01:00
409b4e2a42
Minor: make the trace logging for the RPC server a bit more helpful.
2018-08-23 13:12:18 +02:00
626b3e6bd3
Minor: make the :node:capsule:build task depend on buildCordaJAR
2018-08-23 13:12:18 +02:00
759419fcc1
ENT-2355 Insert transactions without checking for duplicates ( #1350 )
...
* ENT-2355 Make transactions storage optimistic if in a flow and the flow has never restored from a checkpoint.
(cherry picked from commit 9a2e9b0)
* ENT-2355 Insert transactions with optimism.
* Added some comments.
2018-08-23 11:06:14 +01:00
bcfadfeebf
CORDA-1833: Create a picocli base class ( #3826 )
...
* Add shell extensions to CLI utils class and move into its own module
* Fix issue with completion script generation and slight refactor
* Fix autocompletion for logging level
* Delete uneeded comment
* More tidying up
* Make run function final
* Fixed an issue with the program being run twice.
* Address review comments
2018-08-22 21:51:25 +01:00
feaf6aa03c
CORDA-1878: Improve exception handling when base directory is not readable or writable by the application user.
2018-08-22 15:55:52 +01:00
217c3b1e3e
ENT-2202 Liquibase migration scripts for schema change coming from OS.
2018-08-22 15:13:50 +01:00
571eec5a72
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180822-1
2018-08-22 15:06:56 +01:00
30d07bc998
ENT-2202 Fold transaction mapping column into transactions table ( #3836 )
...
* ENT-2202 Fold transaction mapping column into transactions table
* Remove from node schema.
* Fix bug.
2018-08-22 14:14:55 +01:00
0a5dcc91ea
Merge remote-tracking branch 'open/master' into mike-merge-2fae95c58f9
2018-08-22 14:27:45 +02:00
79309ae94a
Liquibase: add column is_modifiable to vault_states table ( #1346 )
2018-08-22 13:13:42 +01:00
1d05c16942
ENT-2439 Fix compression in serialization ( #3825 )
...
* ENT-2439 Fix compression in serialization
2018-08-22 10:37:18 +01:00
f94abf726b
Fixing exception messages not showing up in the console because of log4j2.xml setup. ( #3830 )
2018-08-21 21:28:13 +01:00
41fc8d6c55
Remove BFTSMaRtTests. ( #3822 )
2018-08-21 13:02:18 +01:00
0045fe24fd
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180821-1
...
# Conflicts:
# docs/source/index.rst
2018-08-21 09:37:56 +01:00
a287673432
Merge commit 'ff62df8d5a0ab9eabfe919b65a8c73baa3dca7f3' into chrisr3-os-merge
...
Conflicts:
finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt
node/src/main/kotlin/net/corda/node/NodeArgsParser.kt
node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
2018-08-20 15:46:20 +01:00
7082e68409
Cleanup the Jib build task
2018-08-20 15:13:55 +01:00
2f76651d00
ENT-2378 ENT-2377 Minimise database access during transaction creation and recording for public key handling ( #3812 )
...
* ENT-2378 ENT-2377 minimise database access by making more use of caches for filterMyKeys, and don't make a redundant database check for existence of new random keys.
* ENT-2378 Unit test for new method in PersistentIdentityService.
2018-08-20 15:01:51 +01:00
9bb9c6ae30
Merge pull request #3727 from corda/improved-error-message-for-missing-suspendable-cases
...
Added more descriptive error message for the cases when a transaction…
2018-08-20 13:18:26 +01:00
88dd6a2888
Fix Jib build ( #3811 )
2018-08-20 13:08:58 +01:00
d0ecab0781
Added more descriptive error message for the cases when a transaction context is missing from the flow state machine
2018-08-20 08:31:35 +01:00
