b19dac02c4
remove temporary code, reorder lines
2018-05-02 00:11:18 +01:00
1a616b1063
resolve merge conflicts - compilation error, fix integration tests in remote database mode
2018-05-01 23:48:13 +01:00
b25892e45b
resolved conflicts
2018-05-01 21:32:11 +01:00
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
29615f512e
Close DB after test
...
Add unique node prefix to DB source
2018-05-01 14:37:35 +01:00
5edb414a07
Merge pull request #794 from corda/feature/small_fix_doc
...
Fix docs
2018-05-01 13:12:45 +01:00
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
bc77492d45
Compilation fix
2018-05-01 10:48:56 +01:00
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
7bbae1c311
Fix docs
2018-04-30 18:08:35 +01:00
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
2a37ce438a
ENT-1831 Delete notaryhealthcheck which is now in CC ( #791 )
2018-04-30 17:23:59 +01:00
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
f25b0bd1c5
Add more documentation on private networks ( #786 )
...
Add more documentation on private networks
2018-04-30 16:01:53 +01:00
e49fbaa956
ENT-1823 Publish migration tool
2018-04-30 15:41:03 +01:00
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
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
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
c3e6b39e59
artemis upgrade to 2.5.0 ( #3029 )
2018-04-27 19:54:08 +01:00
0cbfab9214
CORDA-1335: Move DistributedServiceTests into a separate package to reduce size of attachments produced. ( #3021 )
2018-04-27 16:47:01 +01:00
6e7787bd64
Better login missing cash selection implementation. ( #3026 )
...
* When a cash selection implementation cannot be found for a driver name, print the driver name and also driver names with implementation (available).
* Remove MySQL stub class as it would be misleading in error logs (MySQL would appear as implemented).
2018-04-27 16:06:56 +01:00
efd203e5f3
ENT-1540: Make sure transactions with "expired" time windows get re-notarised correctly ( #3004 )
...
* ENT-1540: Make sure transactions with "expired" time windows get re-notarised correctly.
Currently the time window is checked before states are being passed to a uniqueness provider. If the time window is
invalid, the transaction will be rejected even if it has already been notarised, which violated idempotency.
For this reason the time window verification was moved alongside state conflict checks.
* Update API - this only affects custom notary interfaces
2018-04-27 15:02:09 +01:00
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
6b78ee8c14
Fix incorrect imports. ( #3022 )
2018-04-27 11:52:51 +01:00
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
0f310dd966
Updates withoutIssuer to not strip display token size.
2018-04-27 10:26:47 +01:00
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
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
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
235df69efe
[CORDA-1379]: Allow soft trapping of unknown config keys. ( #3011 )
2018-04-27 15:33:13 +07:00
efa69ce959
Whitelists Triple.
2018-04-27 08:57:28 +01:00
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
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
a275aec546
Merge pull request #784 from corda/kstreich-ENT-OS-merge
...
OS merge
2018-04-26 18:34:46 +01:00
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
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
627708a63a
Merge commit 'cde701ab10a04a25fca2e7c69d8b49e36f439f58' into kstreich-ENT-OS-merge
2018-04-26 16:30:47 +01:00
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
a256ad972e
Fix SQL statement used by CashSelection on Oracle database. ( #781 )
2018-04-26 16:05:18 +01:00
01a07481ad
Merge pull request #783 from corda/thomas-merge
...
OS Merge
2018-04-26 16:02:50 +01:00
22d5967b9e
Adds setting the PATH environment variable to the set-up instructions.
2018-04-26 15:50:17 +01:00
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
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
2ff3939e2e
Add exponential backoff to P2P messaging retry ( #2975 )
2018-04-26 13:58:41 +01:00
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
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
eb5b03e2f5
[Bug fix] - explorer doesn't remove node from network view. ( #779 )
2018-04-26 13:19:06 +01:00
d2b6978d90
Merge pull request #778 from corda/aslemmer-merge-88c12791a81a49bdaab93e6bda4d070d7bf1ac5c
...
Aslemmer merge 88c12791a8
2018-04-26 11:41:20 +01:00
266b96f99c
Merge commit '88c12791a81a49bdaab93e6bda4d070d7bf1ac5c' into aslemmer-merge-88c12791a81a49bdaab93e6bda4d070d7bf1ac5c
2018-04-26 10:01:30 +01:00
999048db48
Merge pull request #772 from corda/mike-merge-4cfb1606da
...
Merge to 4cfb1606da
2018-04-26 09:27:25 +02:00
