Commit Graph

5449 Commits

Author SHA1 Message Date
Katelyn Baker
f4781cd4a5
CORDA-1803 - Fix variable replacement (#3585) (#3866) 2018-09-06 11:03:45 +01:00
Michal Kit
0417270bc1 CORDA-1932 Fixing network map certificate path validation (#3877) 2018-09-06 11:14:04 +02:00
Michal Kit
2b9838d7f7 CORDA-1934 Renaming INTERMEDIATE_CA certificate role to DOORMAN_CA certificate role (#3878) 2018-09-06 11:13:42 +02:00
Patrick Kuo
205d3c3797 CORDA-1604 Node Info file watcher should block and load node info when node startup (#959) (#3333) (#3879)
(cherry picked from commit 2fce979)

(cherry picked from commit 072b4207e0)
2018-09-06 11:13:22 +02:00
Michal Kit
6d43a654ff CORDA-1938 Adding version info to the node info submission request (#3854) (#3885) 2018-09-06 11:12:56 +02:00
Michele Sollecito
6e1cbd2aa3
Merge pull request #3876 from corda/thomas/cherry-pick-ENT-2054
Cherry pick ENT-2054
2018-09-05 10:14:11 +01:00
Michele Sollecito
56a1e59443
Merge pull request #3873 from corda/CORDA-1837-v3
CORDA-1837: Reject nodes that have the same organisation name in driver tests
2018-09-04 18:11:50 +01:00
Dan Newton
43272594f7 CORDA-1837: Reject nodes that have the same organisation name in driver tests
* Reject nodes that have the same organisation name as a previously registered node rather than the same X500 name

(cherry picked from commit 40b922c1f2)
2018-09-04 12:40:05 +01:00
Viktor Kolomeyko
bb89d0c2cf ENT-2054: Logging improvements (#3397) 2018-09-04 08:00:31 +01:00
Michele Sollecito
0df77d5b64
Backports: CORDA-1663, CORDA-1638, CORDA-1542 (#3881) 2018-09-03 16:15:03 +01:00
Clinton
ac694e3023 DEVOPS-764 - Jolokia dependency is incorrectly specified and removed in master (#3380)
* DEVOPS-764 - Jolokia dependency is incorrectly specified and removed in master.

* Backported more changes.
2018-08-30 16:02:24 +01:00
josecoll
80c6c46d6f CORDA-1888 - Fix Vault Query composite queries (#3775) (#3869)
* CORDA-1888 Fix Vault Query composite queries  (#3775)

* Reproduce composite query failures.

* Fixes to OR querying and composite queries that use the same QueryCriteria (Linear, Fungible, Custom) more than once.

* Revert debug logging for Hibernate SQL.

* Cleanup and remove redundant joinPredicates global var.

* Fix failing Java Unit test.

* Fix Java compilation error in example-code section of docs.

* Include copy() function for original constructor to maintain backwards API compatibility.

* Fixed compilation errors post cherry-pick.
2018-08-30 16:00:50 +01:00
Katelyn Baker
33d94de91d
CORDA-1841 - Made paths in tutorial-cordapp consistent. (#3778) (#3867) 2018-08-30 14:50:05 +01:00
Katelyn Baker
940bb3bdbd
CORDA-1812 - fix Postgres db bloat issue (#3614) (#3857) 2018-08-30 12:00:09 +01:00
Chris Rankin
d15efcec10 CORDA-1907: Allow Corda's shell to deserialise using generic type information. (#3810) (#3827) 2018-08-22 11:43:41 +01:00
Chris Rankin
f5f1564205 CORDA-1906: Add Servlet 3.1 implementation into the WebServer. (#3794) (#3820) 2018-08-21 16:50:42 +01:00
Chris Rankin
81d9e4f382 CORDA-1905: Extend JSON deserialisation to handle Amount<T> for any T (#3819)
* CORDA-1905: Extend JSON deserialisation to handle Amount<T> for any T. (#3790)

* Extend JSON deserialisation to handle Amount<T> for any T.
* Rewrite message for @Deprecated.

Conflicts:
	client/jackson/src/main/kotlin/net/corda/client/jackson/internal/CordaModule.kt

* CORDA-1905: Configure Spring Boot to use same version of Jackson as Corda.
2018-08-21 16:50:32 +01:00
josecoll
e301977b17
Fix loadStates for large page sizes and added unit test. (#3788) 2018-08-16 10:14:17 +01:00
Michele Sollecito
769586fdf5
[CORDA-1681]: It is not possible to run stateMachinesSnapshot from the shell (fixed). (#3792) 2018-08-15 17:05:01 +01:00
Joel Dudley
9e9dda6693
Removes old Corda Zone reference (#3781) 2018-08-14 13:03:56 +01:00
Joel Dudley
5fcabfec57
Update index.rst 2018-08-14 10:09:40 +01:00
joeldudleyr3
5e46032f2c RELEASE - Backport fixes
* Rolls back dirty change.
 * Rolls back unneeded import.
2018-08-08 11:30:57 +01:00
Dan Newton
599aa709dd CORDA-1837 - Reject nodes that have the same organisation name in driver tests (#3740)
* Reject nodes that have the same organisation name as a previously registered node rather than the same X500 name

DriverDSLImpl -> NetworkVisibilityController -> register check organisation name rather than X500 name and throw IllegalStateException if already exists
Added test to DriverTests to test multiple organisation names end exceptionally

* Remove redundant test and store the organisation names rather than X500 names for driver tests
2018-08-08 11:30:57 +01:00
Jiachuan Li
83a0988517 DOCS - Miner change to mention notary node dosen't need web server, and also change the total terminal windows number from 8 to 5 (#3012)
* There is a duplication of the kotlin introduce part, which is the same as the description of the "Note" section right below. So remove this duplicated part but keep the "Note".

* A miner change about the build node folder structure, first is Notary node doesn't need one web server, second is in V3.0, there are 5 windows totally but not 8.

* Miner updates for the format of changes, as instructed by Joel on https://github.com/corda/corda/pull/3012
2018-08-08 11:30:57 +01:00
Jiachuan
f23f2ee696 CORDA-1201 - Remove duplicated doc section. (#2924) 2018-08-08 11:30:57 +01:00
PyPie
07e3ff502f DOCS - A typo fix.
Line 108
Was: We want to create an IOU of 100 with PartyB. We start the ``IOUFlow`` by typing:
Should be We want to create an IOU of 99 with PartyB. We start the ``IOUFlow`` by typing:
2018-08-08 11:30:57 +01:00
Roman Plášil
ec1e40109d CONTRIBUTION - Configure NetworkMapUpdater executor so that it doesn't block node shutdown (#3530) 2018-08-08 11:30:57 +01:00
renlulu
cda7c29243 CONTRIBUTION - Optimize imports (#2872) 2018-08-08 11:30:57 +01:00
cxyzhang0
a86c79e40c CONTRIBUTION - IdentitySyncFlow - loadStates of an input only if it is in local storage (#3701) 2018-08-08 11:30:57 +01:00
Tushar Singh Bora
279b8deaa6 DOCS - Update Shell.rst with CashIssueFlow (#3546)
* Updated for issue: 3120

https://github.com/corda/corda/issues/3120- for details

* Updated shell.rst

Correct Shell Flow usaged for CashIssueFlow

* Updated Shell.rst as per latest CashIssueFlow
2018-08-08 11:30:57 +01:00
Venelin Stoykov
4def8395b3 DOCS - flowTracker to progressTracker (#3316)
Resolve #3291
2018-08-08 11:30:57 +01:00
Mohamed Amine LEGHERABA
14e9bf100d DOCS - update azure documentation (#2950)
add yo!app deployment for Corda V2
2018-08-08 11:30:57 +01:00
kid101
37656a58f5 CONTRIBUTION - Update tut-two-party-flow.rst (#3133)
Bug: https://github.com/corda/corda/issues/3120
Updated line 55: From: IOUContract.Commands.Create -> IOUContract.Create
2018-08-08 11:30:57 +01:00
Stanly Johnson
f9a9bb19a7 CONTRIBUTION - Network bootstrapper check for duplicate node names (#3182) 2018-08-08 11:30:57 +01:00
Tittu Varghese
cd89888655 CONTRIBUTION - Added favicon to docs.corda.net (#3199)
* Added favicon to docs.corda.net

* docs.corda.net favicon path fix
2018-08-08 11:30:57 +01:00
Tudor Malene
11d59cf86a CORDA-1847 - Backport hibernate observer fix (#3726)
* CORDA-1847 Backport hibernate observer fix

* CORDA-1847 Fix tests
2018-08-06 11:51:01 +01:00
Joel Dudley
617a96036c
Backports network bootstrapper docs. (#3718) 2018-07-30 13:05:24 +01:00
joeldudleyr3
bce45149a4 Reflects network builder docs. 2018-07-27 15:51:36 +01:00
Anthony Keenan
53b33f138b CORDA-1585 - Tidy up participate docs (#3682)
* CORDA-1585 - Tidy up participate docs + pdf toctree backport (#3674)

* Fix TOC for HTML and PDF (Backport from Enterprise docs)

* Tidy up participate section

* Address review comments

# Conflicts:
#	docs/source/building-container-images.rst
#	docs/source/conf.py
#	docs/source/contributing.rst
#	docs/source/getting-set-up.rst
#	docs/source/index.rst
#	docs/source/release-process-index.rst

* Fixing merge issue

* Add release process changes into index
2018-07-27 10:54:18 +01:00
Katelyn Baker
143e6d3265 RELEASE - Align main V3 release branch with 3.2 release
Should 3.3 occur then this won't break the upgrade or release note
flow
2018-07-24 15:20:22 +01:00
Katelyn Baker
1c5ae15fa4 RELEASE - Bump potential build number
Given we released 3.2-corda from the release-V3.X branch bump
the version number here for the next release.
2018-07-24 14:23:31 +01:00
Joel Dudley
521c1e3e08
Improves docs on running Example CorDapp. Debugging info. (#3670)
* Updates instructions for running example CorDapp.

* Readds debugging information.
2018-07-23 14:49:19 +01:00
Clinton Alexander
2303cdc39e RELEASE - Fixed build.gradle issues that break maven central publishing and standardised dependency specification. 2018-07-20 14:45:35 +01:00
Katelyn Baker
f44cec5321
CORDA-1789 - Split Doorman / NM config - fix for CORDA-1510 (#3605) 2018-07-17 15:11:31 +01:00
Katelyn Baker
729d1b29a6
CORDA-1790 - Roll back flow transaction on exception (#3597) (#3616)
* CORDA-1790 Roll back flow transaction on exception

* CORDA-1790 Roll back flow transaction on exception

* CORDA-1790 Roll back flow transaction on exception
2018-07-16 17:44:34 +01:00
Viktor Kolomeyko
ac6cbeca0c CORDA-1686 - Make "rpc-client-sender" daemon (#3455) (#3611)
Such that they do not prevent application that started them from exiting.

(cherry picked from commit 3492350)
2018-07-16 11:26:13 +01:00
Michele Sollecito
3da07a1105
Merge pull request #3613 from corda/kat/bakport/corda-1804
CORDA-1499, CORDA-1804  (#3607)
2018-07-16 10:39:30 +01:00
szymonsztuka
5f0c8e0707 Backport CORDA-1499 CORDA-1804 - remove unused code. 2018-07-16 10:35:53 +01:00
Katelyn Baker
9865170233 CORDA-1808 - Refactor serialization test infrastructure backport 2018-07-16 10:16:38 +01:00
Katelyn Baker
a47348d52a CORDA-1662 - Post backport fixes 2018-07-16 10:16:38 +01:00