11973 Commits

Author SHA1 Message Date
Mike Hearn
ce7ba2182b Merge remote-tracking branch 'open/master' into mike-merge-ea81548d6 2018-05-11 16:41:39 +02:00
josecoll
4afc7f3824
Behave: fix compilation problem in IntelliJ (#830)
* Sprinkled new gradle dust to make both IntelliJ and TC (gradle) compilation happy.

* Fix compilation problem once and for all + ignore the RPCProxyWebServiceTest smoke test.
2018-05-11 15:21:42 +01:00
Michele Sollecito
ea81548d60
[CORDA-1269]: Changed usages of arrayOf() in Entities to use Kotlin 1.2 style. (#3122) 2018-05-11 21:07:53 +07:00
Katelyn Baker
c5591defe3 Test Fixes 2018-05-11 14:44:17 +01:00
Andras Slemmer
cafed58421 Add back shadowJar compile artifact 2018-05-11 14:19:05 +01:00
Michele Sollecito
bb62538d28
[CORDA-1394]: Node can fail to fully start when a port conflict occurs, without a useful error message (fix). (#3119)
* [CORDA-1394]: Meaningful message if required port is already in use.

* [CORDA-1394]: Meaningful message if required port is already in use.
2018-05-11 20:08:53 +07:00
Mike Hearn
af802bd8c5 Minor: fix a warning in VaultQueryTests 2018-05-11 13:02:40 +02:00
Mike Hearn
54e1a7aa7e Docs: fix some broken markup that caused rendering errors and warnings. 2018-05-11 13:02:40 +02:00
Mike Hearn
e110d17bce Docs: upgrade Sphinx and Pygments.
We get coloured output from make html now. That seems to be the main benefit of the upgrade.
2018-05-11 13:02:40 +02:00
Mike Hearn
c9e31ecd4b Minor: fix a typo in a warning suppression and operator ordering. 2018-05-11 13:02:40 +02:00
Mike Hearn
5e759f5025 Docs: remove things from ChangeLog that aren't of interest to end users. 2018-05-11 13:02:40 +02:00
Katelyn Baker
df68fa1a5e Review comments 2018-05-11 11:53:24 +01:00
Michele Sollecito
3a218b228d
[CORDA-1455]: Error in process-id deletion process allows multiple instances of same node to be run (fix). (#3118) 2018-05-11 17:10:18 +07:00
Joel Dudley
ecc0560ebc
Adds a clear error message from progress tracker requirement fails. (#3116) 2018-05-11 10:46:46 +01:00
Viktor Kolomeyko
1425899b95
Temporarily disable failing test. (#828)
It will be properly investigated and fixed.
2018-05-11 10:36:23 +01:00
Viktor Kolomeyko
e7c2a0ca88
Merge pull request #825 from corda/feature/vkolomeyko/os-merge
OS->Ent merge
2018-05-11 10:35:46 +01:00
Andras Slemmer
7a39ff8617 disable default jar task 2018-05-11 10:20:17 +01:00
Joel Dudley
76b0f75ea3
Documents how a new CorDapp's dependencies and Corda version are defined. (#3117) 2018-05-11 10:12:35 +01:00
Richard G Brown
3cad4bd1cd addressed comments from the public review 2018-05-11 09:43:52 +01:00
josecoll
42452c6735
Fix problem with Python PDF builder failing to render the Sphinx :math: tag directive correctly. (#3113) 2018-05-11 09:26:54 +01:00
Viktor Kolomeyko
e0dfe7a75a Compilation fixes after OS merged. 2018-05-10 16:12:32 +01:00
Michele Sollecito
590f626433
[ENT-1731]: Record an event of loading and unloading CorDapps. (#818) 2018-05-10 22:01:43 +07:00
Michele Sollecito
5e0b27cfae
[CORDA-1445]: Raise proper error when starting node in devMode with compatibilityZoneURL. (#3109) 2018-05-10 22:00:47 +07: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
josecoll
32011e05d1
Add missing logger. (#817)
* Add missing logger.

* Ensure scenario code is compiled as part of the standard gradle build task.
2018-05-10 14:42:30 +01:00
Katelyn Baker
2c40fdf7d4 tidy up 2018-05-10 14:26:42 +01:00
Katelyn Baker
d290fd3d6d ENT-1872 - Better cmdline failure msgs for Doorman
When the config file specified doesn't exist, a stacktrace is dum
ped to stdout rather than just printing a nice error message. Same
for specifying a stupid mode.

The nice fix would be if the cmdline parseing library exposed the error
states from Converters properly. Alas, what it actually does is catch
the exception you'd like and throws a very generic exception.

So, catch and rethrow with a better error message and don't dump the
stack (i.e. exit rather than rethrow)
2018-05-10 14:21:18 +01:00
Chris Rankin
36d13124d5
ENT-1463: Refactor serialisation slightly for determinisation. (#3110) 2018-05-10 12:42:01 +01:00
bpaunescu
99d70fc197
Merge pull request #821 from corda/bogdan-merge-10-05-18
Bogdan os-ent merge 10 05 18
2018-05-10 11:52:27 +01:00
Thomas Schroeter
1a6922afe0
Test notarisation of issue transactions with time-window (#3092) 2018-05-10 11:37:57 +01:00
cburlinchon
1c2d6d8100
Unrevert artemis upgrade to 2.5.0 (#3029) (#815)
* Revert "Revert "artemis upgrade to 2.5.0 (#3029)""
2018-05-10 10:01:37 +01:00
josecoll
0dae108088
Reordering fix: move now works as depends on creation of html directory from previous step. (#3108) 2018-05-10 09:48:19 +01:00
bpaunescu
b4a402de36 Merge remote-tracking branch 'open/master' into bogdan-merge-10-05-18 2018-05-10 09:47:54 +01:00
bpaunescu
8419b24d80
CORDA-1443: re-wrote tests to ensure connection closes before node to avoid lengthy artemis timeouts (#3104) 2018-05-10 09:42:48 +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
Chris Rankin
4b3ddc3946
Merge pull request #819 from corda/chrisr3-os-merge
Merge from OS up to fe88e99
2018-05-09 20:21:19 +01:00
Chris Rankin
3f21c47f39
Remove lingering Kryo reference from AMQP. (#3107) 2018-05-09 20:20:43 +01:00
Michele Sollecito
c369680ccb
[CORDA-1383]: Make SignedTransaction fully Jackson de/serialisable. (#3097) 2018-05-09 22:47:06 +07:00
Chris Rankin
3ce2237adc Merge commit 'fe88e99' into chrisr3-os-merge 2018-05-09 16:44:02 +01:00
Chris Rankin
fe88e9907c
ENT-1463: Replace getStackTraceAsString() with Throwable.initCause(). (#3101) 2018-05-09 16:36:17 +01:00
szymonsztuka
bb95156262
ENT-1447 Database transaction optional ability to retry on nested SQLException. (#3046)
Database transaction can be set to retry failure due to any exception with a cause or a nested cause of SQLException type.
Rationale: By the default transaction is retried only for SQLException. It may happen that SQL Exception is wrapped by Hibernate exception, allow to retry such cases if requested  e.g. database.transaction(recoverableFailureTolerance = 3, recoverAnyNestedSQLException = true) { .... }
2018-05-09 15:45:31 +01:00
Chris Rankin
d3644d89cc
Merge pull request #816 from corda/chrisr3-os-merge
Merge from OS up to 781b5064
2018-05-09 15:32:16 +01:00
Katarzyna Streich
56c6ec967c
ENT-1803: Allow change of updateDeadline on parameters update (#814)
* Allow change of updateDeadline on parameters update

ENT-1803. Parameters that where already advertised still need explicit
cancellation.
2018-05-09 15:01:57 +01:00
Tudor Malene
1535a5f601
CORDA-1315 small doc correction (#3079)
* CORDA-1315 small doc correction

* CORDA-1315 address code review changes
2018-05-09 13:52:58 +01:00
Chris Rankin
8d6c54e2d5 Merge commit '781b50642aec9deeeadee219318509e050f9026e' into chrisr3-os-merge 2018-05-09 13:50:46 +01:00
Chris Rankin
781b50642a
ENT-1463: Prepare node-api for determination. (#3080)
* Prepare node-api for determination.
* Disentangle Kryo and AMQP classes.
* Add version properties for fast-classpath-scanner, proton-j and snappy.
* Remove String.jvm extension function.
* Refactor Cordapp reference out of AMQP serialisers' primary constructors.
2018-05-09 13:37:04 +01:00
Thomas Schroeter
750e368283
[ENT-1859] Handle issue transactions with time window (#809) 2018-05-09 13:12:33 +01:00
Patrick Kuo
be11da76c8
CORDA-1363 Network registration helper should check public key in certificate before storing in keystore (#3071)
* check pub key in network registration helper before storing in DB
2018-05-09 12:56:10 +01:00
Katelyn Baker
8517f51d49
Merge pull request #810 from corda/kat-merge-20180508
Kat merge 20180508
2018-05-09 12:09:33 +01:00