szymonsztuka
1ecf646f7e
Oracle 11xe and 12c database compatibility ( #206 )
...
* Sql setup scripts for Oracle and datasource configuration.
* CashSelection for Oracle.
* Workaround of forbidden distinct for BLOBs.
* ojdbc8.jar driver dependency from Oracle Maven repository, ojdbc6.jar from lib (it's not in Maven repo).
* allow to use random Port in node names and trim it from schema name, remove schema with port numbers from db setup (to cater for new test, non Oracle specific change)
* Removed unnecessary code from ConfigUtilities (non Oracle specific change)
* Removed db integration tests setup for RPCStabilityTest as it doesn't start any nodes
2018-01-29 18:35:58 +00:00
Patrick Kuo
da5d0ab806
Add trace logging to network map service ( #410 )
...
* add trace logging on network map incoming request
* address PR issue, added trace logging for get end points
2018-01-29 17:44:43 +00:00
Shams Asari
2432b1380e
Clean up of network-management to make more use of the existing X509 utilities ( #419 )
2018-01-29 12:49:58 +00:00
Viktor Kolomeyko
3d32760dcc
ENT-1331: Updating High Level design following discussion with Mike, Jose and David H
2018-01-29 12:06:47 +00:00
Rick Parker
be2ae80b55
Fix up some JMeter defaults, and allow non-anonymous cash payments from the sampler ( #413 )
...
* Fix up JMeter jmx files.
* Add anon identity flag
(cherry picked from commit f897b1a)
* Add anon identity flag (fixed)
(cherry picked from commit b43f135)
2018-01-29 10:59:22 +00:00
Matthew Nesbit
8f0457866f
Merge pull request #418 from corda/mnesbit-merge-20180126
...
Merge up from OS including bridge control protocol
2018-01-29 09:22:43 +00:00
Matthew Nesbit
054c44d4bc
Merge from OS to ENT including Bridge manager work
2018-01-26 16:55:43 +00:00
Clinton Alexander
e8f8ff7c94
Revert "Removed gradle plugins from repo to ensure plugins are never changed in R3 corda"
...
This reverts commit c91d9b5507
2018-01-26 16:06:46 +00:00
Clinton Alexander
c91d9b5507
Removed gradle plugins from repo to ensure plugins are never changed in R3 corda
2018-01-26 16:03:10 +00:00
Shams Asari
d3cd2f92a4
Merge pull request #412 from corda/shams-os-merge-250118
...
O/S merge 250118
2018-01-26 15:30:57 +00:00
Shams Asari
881379b889
Merge branch 'master' into shams-os-merge-250118
2018-01-26 13:45:21 +00:00
Shams Asari
336aeb96e5
Merge fixes
2018-01-26 13:45:03 +00:00
Andrius Dagys
e357a88181
Deprecate TimeWindowChecker, make TimeWindowInvalid report exact current time and transaction time window ( #2280 )
...
* Make notary service return the current time and the transaction time window
along with the TimeWindowInvalid error.
Deprecate TimeWindowChecker.
Add a static method for validating transaction time window to reduce code duplication.
2018-01-26 09:32:11 +00:00
Michal Kit
5a29e76664
Unifying HSM signing service name ( #391 )
2018-01-26 09:25:40 +00:00
igor nitto
3be30af161
[ENT-1363] DB integration test fixes ( #411 )
...
Dependencies on JDBC drivers in 'node' need to be marked as 'runtime' instead of 'integrationTestRuntimeOnly', to make them available to integration tests in other projects.
2018-01-25 18:32:34 +00:00
Matthew Nesbit
0ff9c9e2e3
Move to message based bridge control protocol ( #2410 )
...
Tidy up
Remove dead RPCSecurity logic from ArtemisMessageServer
Address PR comments
Address PR comments
2018-01-25 17:53:34 +00:00
Shams Asari
4b86362391
Merge remote-tracking branch 'open/master' into shams-os-merge-250118
...
# Conflicts:
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt
# core/src/test/java/net/corda/core/flows/FlowsInJavaTest.java
# docs/source/changelog.rst
# docs/source/corda-configuration-file.rst
# docs/source/upgrade-notes.rst
# finance/src/test/kotlin/net/corda/finance/contracts/CommercialPaperTests.kt
# finance/src/test/kotlin/net/corda/finance/contracts/asset/CashTests.kt
# gradle/wrapper/gradle-wrapper.properties
# node-api/src/main/kotlin/net/corda/nodeapi/internal/KeyStoreConfigHelpers.kt
# node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/SetsSerializationTest.kt
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/SSHServerTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
# node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/main/resources/reference.conf
# node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# node/src/test/kotlin/net/corda/node/services/network/NetworkMapCacheTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/network-visualiser/src/main/kotlin/net/corda/netmap/NetworkMapVisualiser.kt
# samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/internal/TestNodeInfoBuilder.kt
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
# webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-01-25 17:51:13 +00:00
Joel Dudley
b8f25fe689
Docs on contributing to Corda
2018-01-25 17:15:36 +00:00
Michal Kit
83ea4611ca
Addressing multiple key groups. Removing redundant config parameters for private key passwords ( #409 )
2018-01-25 16:40:42 +00:00
Michal Kit
5f1590d97f
Cherry picked commit from the release DEV preview branch. This is the fix for the database config not being honoured by doorman ( #408 )
2018-01-25 15:41:59 +00:00
Mike Hearn
17a6f61eba
Simplify CashTests and add some comments/convenience APIs to MockServices ( #2241 )
2018-01-25 16:29:26 +01:00
Andrzej Cichocki
242d9cf7ad
CORDA-692 Don't include internal packages in API documentation ( #2415 )
...
* Use G1 for gradle daemon
2018-01-25 15:26:13 +00:00
Joel Dudley
471907366b
Renames Controller to NetworkMapAndNotary, in line with templates and example CorDapp.
2018-01-25 15:14:32 +00:00
josecoll
371cb0a081
Gradle plugins: additional of publish sources configuration field ( #2420 )
...
* Gradle plugins change: publication of source code is config driven (defaults to true).
2018-01-25 14:40:11 +00:00
Michele Sollecito
9783f11ba8
Exposed RPC SSL settings through Cordformation ( #2419 )
2018-01-25 14:32:58 +00:00
igor nitto
1be4f0950d
Remove compile time dependency on JDBC drivers [ENT-1363] ( #387 )
...
* Change JDBC drivers dependencies to integrationTestRuntimeOnly
* Added smoke test validating JDBC driver registration located in "./plugins" directory
* Some docsite tweaks
2018-01-25 13:38:51 +00:00
Thomas Schroeter
b50ce0ab8d
HA-notary health check flow ( #396 )
...
* Add simple notary health check flow
* Move notary test to notary health check
* Rebase
2018-01-25 10:34:07 +00:00
jamesbr3
5f8af818b1
Merge pull request #2408 from corda/jamesbr-remove-jolokia-war
...
Remove jolokia war reference from webserver
2018-01-24 21:19:50 +00:00
Shams Asari
0fa6969d5d
Added various X509 utilities to remove some of the existing boilerplate. ( #2416 )
2018-01-24 18:07:29 +00:00
Katelyn Baker
3c95772288
Merge pull request #2418 from corda/kat/feature/gradleUpgrade4.4.1
...
Upgrade gradle to 4.4.1
2018-01-24 17:29:03 +00:00
Joel Dudley
52ae34782d
Removes a reference to the bundled node webserver.
2018-01-24 16:41:49 +00:00
Patrick Kuo
5be4df918e
Make truststore password configurable during root store generation in doorman ( #388 )
...
* Doorman will now ask for truststore password, or can be provided in cmd line arg.
* rebase and changed keystore filename for HSM
* make "network-root-truststore.jks" a const
2018-01-24 16:17:32 +00:00
Katelyn Baker
51d6209c97
Upgrade gradle to 4.4.1
2018-01-24 16:15:43 +00:00
Mike Hearn
cfb8997f23
Fix build break due to an API change between PR check and merge
2018-01-24 17:14:03 +01:00
Ben Wyeth
d17670c747
Provide an API to register callback on app shutdown ( #2402 )
...
Provide an API to register callback on app shutdown.
2018-01-24 16:19:24 +01:00
Michele Sollecito
3c0e006456
Reverted incorrect additional advertised RPC address in NodeInfo ( #2417 )
2018-01-24 14:42:07 +00:00
Patrick Kuo
45b23737c7
Fix broken network management server status endpoint ( #397 )
...
* add missing Path annotation and test
* Address PR issue
2018-01-24 14:41:12 +00:00
Michal Kit
55385613ac
Removing configuration parameter for private key passwords ( #395 )
2018-01-24 12:12:46 +00:00
Tudor Malene
cef1f9885c
ENT-1282: create standalone db migration tool ( #356 )
...
* ENT-1282: add standalone db migration tool that works with both the node and the doorman
* ENT-1282: remove cmd line args during node startup
* ENT-1282: more clear message
* ENT-1282: fix integration test
* ENT-1282: more fixes and cleanup code
* ENT-1282: address PR comments
* ENT-1282: more fixes and refactoring
* ENT-1282: more classloader fixes
* ENT-1282: changes after demo feedback
* ENT-1282: update API
* ENT-1282: update documentation
* ENT-1282: formatting
* ENT-1282: added CONSOLE option for dry-run and logging
* ENT-1282: documentation changes
* ENT-1282: remove getMigrationResource from the public API
* ENT-1282: removed dependency on network-manager, added release-lock
* ENT-1282: Update documentation
2018-01-24 11:55:43 +00:00
Shams Asari
61c7de22d6
Replaced KeyStoreWrapper with X509KeyStore, which is still a wrapper but assumes only X509 certs and has better APIs ( #2411 )
2018-01-24 07:51:55 +00:00
Joel Dudley
5df50c0e81
Fixes a bug in the deserialisation of UniqueIdentifiers in the CRaSH shell.
2018-01-23 17:28:24 +00:00
Thomas Schroeter
a564c9bfd3
Notary metrics ( #383 )
...
* Track the distribution of the number of input states
* Log number of input states and commit duration
...and move the rollback
* Update schema
2018-01-23 16:24:51 +00:00
Michele Sollecito
142f52fa82
[CORDA:936]: Enable RPC layer to work with SSL
2018-01-23 16:23:37 +00:00
Tudor Malene
c81e597199
Fix liquibase files after node split ( #393 )
2018-01-23 15:06:21 +00:00
Anthony Keenan
70f1fdeb2b
CORDA-939 Make SerializationEnvironmentRule.env private so as not to expose internals. ( #2404 )
...
* Make SerializationEnvironment private so as not to expose internals.
* Only expose used parts of api
* Make properties lateinit
* Removing java calls to getEnv
* Initialise properties at declaration
* Tidy up imports
2018-01-23 14:42:30 +00:00
Rick Parker
f628f30098
ENT-1382 JMeter changes to allow easy HTML report generation ( #382 )
...
* Fixes to allow the HTML reports to be run on JMeter CSV output files, with custom label. Also adjust each test plan and examples to include the label.
(cherry picked from commit 35fd309)
* Added some documentation to the README.
2018-01-23 14:00:36 +00:00
Michal Kit
789ce5d44a
Initial implementation of the certificate generation tool ( #148 )
...
* Initial implementation of the certificate generation tool
* Adding trust store persisting
* Addressing review comments
* Adding certificate type to the certificate generation process.
* Addressing review comments
* Fixing typos
* Changing keyOverride to 0 in examples and tests
* Addressing review comments + rebasing
* Adding CRL information to the certificate generation process
* Generation tool refactoring
* Addressing review comments
2018-01-23 11:50:03 +00:00
josecoll
d2795954cb
Merge pull request #379 from corda/colljos-schema-split-for-notaries
...
CORDA-917 Bootstrap nodes without Notary schemas
2018-01-23 09:16:39 +00:00
Christian Sailer
013ac82dde
ENT-1412 flow state machine metrics ( #390 )
...
* re-add metrics for flows started, flows finished and checkpoint rate
Add metric for checkpoint volume rate.
* Put error and success counters in FlowStateMachine
* Optional graphite metrics writer
* Improved checkpoint volume metrics.
* Code review: Clean up/layout.
* Code review: spelling
2018-01-23 09:15:09 +00:00
James Brown
8de2c78dd2
Remove jolokia war reference from webserver
2018-01-22 16:21:28 +00:00
