26b3c0173d
Fixing grammar
2016-11-03 11:01:36 +00:00
ca2a37915d
Review fixes for docs.
2016-11-03 11:01:36 +00:00
73a2215747
Added core changes and docs required for simm valuation demo.
2016-11-03 11:01:36 +00:00
6d39b71bf9
Simple RPC access control, with a demo control on the cash RPCs
2016-11-03 10:46:25 +00:00
a7dfb43c63
Merged in clint-publishrunconfig (pull request #437 )
...
Added publish to maven local run config and added publish to the install run configuration.
2016-11-03 10:04:25 +00:00
54dfced4ab
Added publish to maven local run config and added publish to the install run configuration.
2016-11-03 09:54:41 +00:00
908772d85a
Remove rogue empty file that sneaked into last commit.
2016-11-02 15:05:42 +00:00
678b006438
Merged in colljos-vault-transaction-notes (pull request #419 )
...
Vault transaction notes (COR-451)
2016-11-02 15:01:51 +00:00
1d25d23b73
Merge from master
2016-11-02 14:20:51 +00:00
6deaf2c12c
Merged in colljos-vault-code-clean-up-refactor (pull request #435 )
...
Colljos vault code clean up refactor
2016-11-02 14:01:24 +00:00
3410671694
Merge branch 'master' into colljos-vault-code-clean-up-refactor
2016-11-02 13:51:49 +00:00
3b0f173984
Merged in clint-cordformdeps (pull request #424 )
...
Cordapps now correctly resolve dependencies.
2016-11-02 11:26:12 +00:00
18bd53711f
Fixed spelling of CorDapp.
2016-11-02 11:23:31 +00:00
69dcd45660
CorDapp dependencies must now be fully qualified maven dependency names.
2016-11-02 11:22:52 +00:00
012dc9ec10
Merge branch 'master' into colljos-vault-code-clean-up-refactor
2016-11-02 11:20:21 +00:00
a38b363e9d
Fixed subtle bug in Cash Spending when processing for same Issuer with multiple refs.
2016-11-02 11:15:09 +00:00
29e203315b
Cordapps now correctly resolve dependencies.
2016-11-02 11:12:31 +00:00
ad81ecf2f9
Merged in clint-todocleanup (pull request #432 )
...
Removed unused files, cleaned up build scripts.
2016-11-02 11:06:10 +00:00
847257c250
Merged in parkri-speed-up-integration-tests (pull request #434 )
...
Speed up JDBCHashMapTestSuite by 3min on my laptop by avoiding Exposed table existence checks each time a map/table is created by re-using the map/sets across tests (after clear()-ing to reset their state).
2016-11-02 11:02:54 +00:00
b188bfda52
Speed up JDBCHashMapTestSuite by 3min on my laptop by avoiding Exposed table existence checks each time a map/table is created by re-using the map/sets across tests (after clear()-ing to reset their state).
2016-11-02 10:08:38 +00:00
f26813c1ab
Merged in rnicoll-cache-key-collision (pull request #425 )
...
Error if multiple nodes match a key
2016-11-01 18:14:23 +00:00
7e3c00c1ff
Merged in colljos-pluginservicehub (pull request #427 )
...
Added PluginServiceHub for use by Corda plugin service extensions.
2016-11-01 17:12:52 +00:00
f415c497d9
Minor changes to address PR feedback and comments
2016-11-01 16:47:50 +00:00
a0aa16ffae
Merge remote-tracking branch 'origin/colljos-vault-code-clean-up-refactor' into colljos-vault-code-clean-up-refactor
...
# Conflicts:
# node/src/main/kotlin/com/r3corda/node/services/vault/NodeVaultService.kt
2016-11-01 16:30:56 +00:00
e449ba93c4
Minor fix following rebase to incoporate Ross changes to CashState definition.
2016-11-01 16:29:21 +00:00
b4ee47bd33
Error if multiple nodes match a key
...
InMemoryNetworkMapCache.getNodeByPublicKey() previously returned null if multiple nodes matched
a given public key (for example if the same node is registered more than once with different
names). This is incorrect behaviour, as there is a match.
2016-11-01 16:27:54 +00:00
0232628f49
Merged in rnicoll-web-server-diagnostics (pull request #416 )
...
Add diagnostics for web server and API plugin instantiation
2016-11-01 16:27:09 +00:00
7360394367
Removed redundant and unused files.
2016-11-01 16:23:03 +00:00
e6a0f18436
Add diagnostics for web server and API plugin instantiation
2016-11-01 16:22:49 +00:00
be3b7b14bd
Re-factoring of CashBalances code (moved to VaultService)
...
Re-factoring of OnLedgerAsset generateSpend code (moved to VaultService)
Fixed broken tests caused by missing Transaction Context (when moving from InMemory to Db implementation of vault service in MockNetwork)
Adapted all Contract tests that perform Cash Spending to use the Vault Service.
Note: pending resolution of 2 failing tests (IRSSimulation, CP issue, move & redeem)
Fixed items raised by MH in CRD-CR-58 code review.
Decommissioned InMemoryVaultService service (all dependent Tests updated to use NodeVaultService)
Merge remote-tracking branch 'remotes/origin/master' into colljos-vault-code-clean-up-refactor
Fixed conflict.
Fixed failing Commercial Paper test.
FungibleAsset reverted back to original filename.
2016-11-01 16:17:39 +00:00
253a70f55e
Fixed bug in generateSpending whereby Issuer Ref was not being checked.
2016-11-01 16:12:19 +00:00
1e6cca4d5d
Removed dead installDist configurations and moved Jolokia access to the correct resources dir.
2016-11-01 16:09:13 +00:00
2744d8abaa
Tech white paper: new sections on the data model, identity lookups, attachments, dispute resolution, compound keys, timestamps.
2016-11-01 16:40:59 +01:00
f7c3b95928
Merged in clint-cordform-nodeconf-fix (pull request #429 )
...
Fixed node config file being written to the wrong place in Cordformation templates.
2016-11-01 15:24:37 +00:00
b4affcbc63
Merged in rnicoll-remove-fungible-asset-properties (pull request #408 )
...
Remove deposit and issuanceDef fields
2016-11-01 14:52:12 +00:00
613a86c5d9
Remove deposit and issuanceDef fields
...
Remove deposit field from the FungibleAsset interface, and moved it into a fixed reference to
amount.token.issuer.
Remove issuanceDef field and replace it with amount.token.
2016-11-01 14:49:57 +00:00
dea9d663ff
Fixed node config file being written to the wrong place in Cordformation templates.
2016-11-01 14:11:42 +00:00
74dc0b7154
Exposed Vault Transaction Note functionality via RPC.
2016-11-01 12:46:41 +00:00
d9f0a161e4
Addressed comments in PR review.
2016-11-01 12:05:48 +00:00
276683e053
Merged in clint-attachmentdemosample (pull request #421 )
...
Moved attachment demo to another repo. Added ApiUtils.
2016-11-01 11:54:59 +00:00
7d08c0b068
Removed attachment demo.
...
Added ApiUtils - a library for managing api lifecycles with less boilerplate.
Added default values to http api and improved the api utils.
Fixed spacing and comments.
Removed withName and added a bad request response to handle error cases.
Replaced use of 400 error with a 404 and error message as per HTTP spec.
2016-11-01 11:53:49 +00:00
1b2c1bd7c4
Merged in rg_permission_changes (pull request #428 )
...
Changing permission on scripts runnodes to uog+rx
2016-11-01 11:51:25 +00:00
c4ce05cc1c
Changing permission on scripts runnodes to uog+rx
2016-11-01 11:47:53 +00:00
c5500caf98
Minor changes to address PR feedback and comments
2016-11-01 11:39:11 +00:00
e5d210492b
Merged in aslemmer-fix-debian-localhost-bind (pull request #423 )
...
core: Bind client socket to getLocalHost explicitly, fixes #6
2016-11-01 10:04:28 +00:00
308d7c1df7
Added PluginServiceHub for use by Corda plugin service extensions.
2016-10-31 17:15:06 +00:00
3f36462053
core: Bind client socket to getLocalHost explicitly, fixes #6
2016-10-31 15:53:15 +00:00
96007cd777
Changed transaction notes type DB from 'blob' to 'text'
2016-10-31 15:07:34 +00:00
822ea360a6
Merge remote-tracking branch 'origin/colljos-vault-code-clean-up-refactor' into colljos-vault-code-clean-up-refactor
2016-10-31 14:05:02 +00:00
f34683fbc4
Fixed bug in generateSpending whereby Issuer Ref was not being checked.
2016-10-31 14:02:33 +00:00
