11628 Commits

Author SHA1 Message Date
josecoll
0072d41958 Fixed incorrect references to (renamed) feature files. 2018-05-08 14:00:47 +01:00
josecoll
6c4da2a3a0 Added Java properties to configure location of Node configuration directories and JDBC driver jar. 2018-05-02 17:59:28 +01:00
josecoll
3f0f603ded Final clean-up. 2018-05-02 15:52:35 +01:00
josecoll
c27003b471 Revert: Extensions to Corda Behave for CTS. 2018-05-02 15:51:45 +01:00
josecoll
8f47fe8c68 Extensions to Corda Behave for CTS.
Minor fixes following integration and regression testing with CordaRPCProxy

Remove unrelated code.

Address remaining PR review comments.
2018-05-02 12:31:22 +01:00
josecoll
a5e2058a5b
Merge pull request #762 from corda/colljos-qa-scenarios
ENT-1834: Compatibility Test Suite QA scenarios
2018-05-02 12:30:47 +01:00
josecoll
6b65bead21
Merge pull request #761 from corda/colljos-behave-rpc-proxy
ENT-1834: QA HTTP-RPC Proxy for mixed Corda Node testing using CTS
2018-05-02 12:14:25 +01:00
josecoll
f013c1dcb7 Address remaining PR review comments. 2018-05-02 11:09:25 +01:00
josecoll
ccd5f5fd5b Re-apply previous fixes. 2018-05-02 10:47:12 +01:00
josecoll
d840099049 Minor updates following PR review feedback. 2018-05-02 10:30:38 +01:00
Patrick Kuo
5ed60ab60d
Bug fix: registration tool doesn't register for service identity if keystore already contains node cert (#756)
* fix a bug where registration tool will refuse to register for a service identity if the keystore contain NODE_CA key already.
some refactoring
2018-05-02 09:54:28 +01:00
josecoll
764af04608 Moved RPC Proxy to own module in testing/qa/behave/tools
Incorporating PR review feedback.

Minor fixes to default path and additional copying of startup script.
2018-05-01 17:04:46 +01:00
Maksymilian Pawlak
8eb976d035
Merge pull request #795 from corda/m4ksio-os-merge-30-04-2018
Merged https://github.com/corda/corda/pull/2994 and fixed conflicts
2018-05-01 16:00:42 +01:00
Maksymilian Pawlak
29615f512e Close DB after test
Add unique node prefix to DB source
2018-05-01 14:37:35 +01:00
Tudor Malene
5edb414a07
Merge pull request #794 from corda/feature/small_fix_doc
Fix docs
2018-05-01 13:12:45 +01:00
Maksymilian Pawlak
597a15a230 Compilation fix
Daily DB integration test ignore, to release merge lock and allow for proper refactor
2018-05-01 12:33:13 +01:00
Maksymilian Pawlak
bc77492d45 Compilation fix 2018-05-01 10:48:56 +01:00
Maksymilian Pawlak
b6e610252f Merge commit 'b210f7ab0ba141a6a02e445741dcdab6f9c5b303' into os-merge-30-04
# Conflicts:
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
2018-04-30 18:22:33 +01:00
Tudor Malene
7bbae1c311 Fix docs 2018-04-30 18:08:35 +01:00
Tudor Malene
772061bab5
Merge pull request #793 from corda/feature/ENT-1823/publish_migration_tool
ENT-1823 Publish migration tool
2018-04-30 17:42:23 +01:00
Andrzej Cichocki
2a37ce438a
ENT-1831 Delete notaryhealthcheck which is now in CC (#791) 2018-04-30 17:23:59 +01:00
Matthew Nesbit
647b821c1c
Merge pull request #787 from corda/mnesbit-add-socks-config-example
Add an example config with SOCKS config and load it in test
2018-04-30 16:31:31 +01:00
Katarzyna Streich
f25b0bd1c5
Add more documentation on private networks (#786)
Add more documentation on private networks
2018-04-30 16:01:53 +01:00
tudor.malene@gmail.com
e49fbaa956 ENT-1823 Publish migration tool 2018-04-30 15:41:03 +01:00
Christian Sailer
e62d1f12c1
DEVOPS-663 Publishing of performance test artefacts (#769)
* Enable publishing of perftest cordapps

* Enable publishing of jmeter-corda as capsule jar

* Enable publishing of jmeter-corda as capsule jar

* jar name

* Correct module name to publish
2018-04-30 14:41:55 +01:00
Chris Rankin
72ba01669a
Move platformSecureRandom property into a separate class. (#790)
This allows it to be deleted completely from core-deterministic.
2018-04-30 13:45:46 +01:00
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
Matthew Nesbit
70ca8f6d6f Add an example config with SOCKS config and a trivial test to prove we can load it.
Address PR comment
2018-04-27 12:56:34 +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
Maksymilian Pawlak
b210f7ab0b
DB test using transaction with rollback rather then recreating whole DB (#2994)
VaultQuery tests wrapped inside transaction which gets rolled back rather then recreating DB from scratch for each test
Moved Missing schema test to separate class, as it modifies global test class state
2018-04-27 09:52:25 +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