ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-04 10:11:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,597 Commits 93 Branches 407 Tags
Commit Graph

11597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
szymonsztuka
416d4ecaeb
ENT-1428 Vault queries - change SQL generation for aggregate function in 'group by' clause. (#426) 
Vault queries: 'order by' function aggregation e.g. 'order by sum(col)' is replaced by the position of the selected column (e.g. 'order by 1').
Rationale: NonStop database doesn't support aggregation function in order by clause e.g. 'order by (sum col_x)'. I couldn't find a way to force Hibernate to produce alias e.g. ' select sum(col_x) as alias_x... order by also_x ...',   and the only solution supported by all db an HPE NonStop is to use positional parameter e.g. 'select sum(col_x) as alias_x... order by 1 ...'
 2018-04-30 09:45:15 +01:00
Michele Sollecito
8ce718f4bf
Merge pull request #785 from corda/merges/april-27-09-38 
Merges: April 27th at 09:38
 2018-04-27 17:26:50 +07:00
sollecitom
70b32636b5 Merge remote-tracking branch 'remotes/open/master' into merges/april-27-09-38 
# Conflicts:
#	docs/source/changelog.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
 2018-04-27 10:12:15 +01:00
szymonsztuka
df5d45a4a6
Enable integration tests to run doorman against remote database (part of ENT-1447) (#776) 
Change integration tests in remote database mode infrastracture to allow passing parameterised dataSource configuration to doorman. Add doorman tables to SQL clearup scripts.
 2018-04-27 09:57:16 +01:00
Michele Sollecito
235df69efe
[CORDA-1379]: Allow soft trapping of unknown config keys. (#3011) 2018-04-27 15:33:13 +07:00
Joel Dudley
efa69ce959
Whitelists Triple. 2018-04-27 08:57:28 +01:00
Anthony Keenan
aecde00365
CORDA-1001 Remove unused bits of PersistentMap (#3001) 
* Remove unused bits of PersistentMap

* Add persistent map tests

* Reivew comments
 2018-04-26 21:58:01 +01:00
szymonsztuka
cec2f25c67
ENT-1627 - Allow to set hibernate.dialect setting for pluggable database (#687) 
Optional property `database.hibernateDialect` which maps to `hibernate.dialect`.
 2018-04-26 19:05:55 +01:00
Katarzyna Streich
a275aec546
Merge pull request #784 from corda/kstreich-ENT-OS-merge 
OS merge
 2018-04-26 18:34:46 +01:00
Patrick Kuo
99129c1141
Merge pull request #3010 from corda/pat/explorer-networkview-bugfix 
[Bug fix] - explorer doesn't remove node from network view.
 2018-04-26 16:52:21 +01:00
Michele Sollecito
033fc3cf7b
[CORDA-1342]: The shell doesn't print the return value of a started flow - fixed. (#3007) 2018-04-26 22:51:23 +07:00
Katarzyna Streich
627708a63a Merge commit 'cde701ab10a04a25fca2e7c69d8b49e36f439f58' into kstreich-ENT-OS-merge 2018-04-26 16:30:47 +01:00
josecoll
b208d03f5c
Corda Behave: compendium of minor changes and improvements (#3008) 
* Compendium of minor changes and improvements:
- build fat behave-jar so can run scenarios from shell scripts (from TC)
- additional run script to execute basic scenarios (for TC)
- default staging path shortened to "corda" (removed deps)
- toned down logging (info -> debug)
- fixed all compiler warnings
- fixed couple of bugs in startup checking steps
- base scenarios use variables declared using Examples parameterization

* Added missing braces

* Changes to address PR feedback.

* Mark underlying Cucumber libraries for future de-coupling.
 2018-04-26 16:13:34 +01:00
szymonsztuka
a256ad972e
Fix SQL statement used by CashSelection on Oracle database. (#781) 2018-04-26 16:05:18 +01:00
Thomas Schroeter
01a07481ad
Merge pull request #783 from corda/thomas-merge 
OS Merge
 2018-04-26 16:02:50 +01:00
Joel Dudley
22d5967b9e
Adds setting the PATH environment variable to the set-up instructions. 2018-04-26 15:50:17 +01:00
Thomas Schroeter
61d2212840 Merge remote-tracking branch 'open-source/master' into thomas-merge 
experimental/behave/src/main/kotlin/net/corda/behave/logging/LogUtilities.kt
node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
 2018-04-26 14:47:29 +01:00
Katarzyna Streich
cde701ab10
Add docs on private networks config and endpoint (#3006) 
Add docs on private networks config and endpoint
 2018-04-26 14:26:37 +01:00
Thomas Schroeter
2ff3939e2e
Add exponential backoff to P2P messaging retry (#2975) 2018-04-26 13:58:41 +01:00
josecoll
5dc71fc350
Behave: use existing Core common utility functions for Logger creation and Ti… (#2990) 
* Use existing Core common utility functions for Logger creation and Time durations.

* Updated JUnit tests.
 2018-04-26 13:40:37 +01:00
Patrick Kuo
1b31574512 [Bug fix] - explorer doesn't remove node from network view. (#779) 
(cherry picked from commit eb5b03e)
 2018-04-26 13:23:16 +01:00
Patrick Kuo
eb5b03e2f5
[Bug fix] - explorer doesn't remove node from network view. (#779) 2018-04-26 13:19:06 +01:00
Andras Slemmer
d2b6978d90
Merge pull request #778 from corda/aslemmer-merge-88c12791a81a49bdaab93e6bda4d070d7bf1ac5c 
Aslemmer merge 88c12791a81a49bdaab93e6bda4d070d7bf1ac5c
 2018-04-26 11:41:20 +01:00
Andras Slemmer
266b96f99c Merge commit '88c12791a81a49bdaab93e6bda4d070d7bf1ac5c' into aslemmer-merge-88c12791a81a49bdaab93e6bda4d070d7bf1ac5c 2018-04-26 10:01:30 +01:00
Mike Hearn
999048db48
Merge pull request #772 from corda/mike-merge-4cfb1606da 
Merge to 4cfb1606da
 2018-04-26 09:27:25 +02:00
Andrius Dagys
7ad19af93f
CORDA-1353: Notaries should reject transactions that contain too… (#2986) 
CORDA-1353: Notaries should reject transactions that contain too many inputs. Otherwise, it may cause a slowdown or make the service hang.
 2018-04-25 17:29:19 +01:00
Konstantinos Chalkias
f89b3b3e0f
Update license year to 2018 (#3000) 2018-04-25 14:47:32 +01:00
Shams Asari
e09fc60294
Improved error message on net parameters mismatch during node startup (#3003) 2018-04-25 14:33:07 +01:00
Joel Dudley
486441c383
Changes flow tests used in flow testing tutorial to use MockNetwork instead of InternalMockNetwork. 2018-04-25 13:53:22 +01:00
Andras Slemmer
88c12791a8
Merge pull request #2999 from corda/CORDA-1368/aslemmer-transaction-wait-dbcommit 
CORDA-1368: Add flow-id to MDC, small fix in DBTransactionStorage
 2018-04-25 13:02:10 +01:00
Joel Dudley
8ce05e0ae3
Updates diagram to correctly show chain-walking process. 2018-04-25 12:54:57 +01:00
Anthony Keenan
f5483d1deb
ENT-1577 - Remove exposure of internal classes via test api (#516) 
* Remove exposures of internal classes via testing api

* Remove deleted api from api-current

* Fix merge conflict

* Remove internal usage from api-current.txt
 2018-04-25 11:59:20 +01:00
Andras Slemmer
29dbe6ab53 Add flow-id to MDC 2018-04-25 10:36:50 +01:00
Andras Slemmer
f1da044c86 Remove double wrap 2018-04-25 10:36:40 +01:00
Mike Hearn
8883803111
Merge pull request #548 from corda/MarkOldfield-patch-1 
Added design checklist
 2018-04-25 11:31:55 +02:00
Mike Hearn
3e27a85fe1 Minor: mention that h2port is only useful for developer mode in enterprise 2018-04-25 10:49:23 +02:00
Mike Hearn
f99d16eebb Merge remote-tracking branch 'open/master' into mike-merge-4cfb1606da 2018-04-25 10:43:23 +02:00
Mike Hearn
4cfb1606da
Minor: document the h2port option (#2988) 2018-04-25 10:38:59 +02:00
Chris Rankin
3fb3371d52
Upgrade DemoBench to TornadoFX 1.7.15 (for Kotlin 1.2). (#2998) 2018-04-24 19:50:43 +01:00
Chris Rankin
ff41f7f1ba
Merge pull request #771 from corda/chrisr3-os-merge 
Merge from OS
 2018-04-24 19:22:23 +01:00
Konstantinos Chalkias
03fb9d4be2
CORDA-1354 Check for jars in nested folders (to add in classpath) (#2981) 
+ edge cases (logging if we don't have permission to jar folders)
 2018-04-24 18:43:07 +01:00
Chris Rankin
e135cf062c Merge commit '5f70b6e04954a6dc64a1a56089eeccb2966bb0ae' into chrisr3-os-merge 2018-04-24 18:09:41 +01:00
Tommy Lillehagen
25bee1903a
ENT-1263 - Use MRENCLAVE instead of enclave ID in create_thread (#487) 
* ENT-1263 - Use MRENCLAVE instead of enclave_id for create_thread

* ENT-1263 - Dedup dependencies in JAR

* ENT-1263 - Ensure C++ 11 is used for enclave inspection tool

* ENT-1263 - Throw exception if enclave ID mapping does not exist
 2018-04-24 17:11:33 +01:00
Andras Slemmer
e3c792c93d
Merge pull request #768 from corda/aslemmer-merge-10c559a3f3dc1cc8055e3204cd289468fbf3e644 
CORDA-1334: Merge up to 10c559a3f3dc1cc8055e3204cd289468fbf3e644
 2018-04-24 16:29:45 +01:00
Chris Rankin
5f70b6e049
Upgrade to corda-gradle-plugins 4.0.14 (#2996) 2018-04-24 15:50:38 +01:00
Chris Rankin
0f4bb8a87c
Upgrade to Kotlin 1.2 API. (#770) 2018-04-24 14:18:11 +01:00
Chris Rankin
8e507d0b88
CORDA-1263: Replace deprecated kotlin-stdlib-jre8 with kotlin-stdlib-jdk8. (#2992) 2018-04-24 14:03:41 +01:00
Andras Slemmer
f7e068b842 Merge commit '10c559a3f3dc1cc8055e3204cd289468fbf3e644' into aslemmer-merge-10c559a3f3dc1cc8055e3204cd289468fbf3e644 2018-04-24 11:19:01 +01:00
Andras Slemmer
67f5bcc38e Merge commit '640e5c60886b23068162205db82b1ae5c7c7eec8' into aslemmer-merge-640e5c60886b23068162205db82b1ae5c7c7eec8 2018-04-24 11:01:21 +01:00
Shams Asari
65525d74e7
CORDA-1325: Bootstrapper unable to whitelist two versions of the same contract simultaneously (#2980) 
Also added unit tests
 2018-04-24 10:51:24 +01:00