ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-15 16:46:12 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
13,571 Commits 99 Branches 407 Tags
Commit Graph

864 Commits

Author SHA1 Message Date
szymonsztuka
44dfa23ad5 Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-to-ecbf23a 2018-11-07 18:17:29 +00:00
Christian Sailer
df954d36d2
Make the shell test pass when it happens to find the Integer constructor (#4187) 2018-11-07 16:37:42 +00:00
Patrick Kuo
459b330ebd
Add programmatic print help to CordaCliWrapper (#4177) 
* add programmatic print help to CordaCliWrapper

* address PR issues

* bug fix
 2018-11-07 14:14:58 +00:00
szymonsztuka
19510315b4 Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-to-6f00560 
# Conflicts:
#	core/src/test/kotlin/net/corda/core/crypto/CryptoUtilsTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalMockNetwork.kt
 2018-11-07 09:49:23 +00:00
Anthony Keenan
ac64b6c37c
Ignoring invalid test (works on Linux not on Windows) (#4173) 2018-11-06 17:31:11 +00:00
josecoll
356941a733 Merge commit '015a36dad67998236eda7e45309e66e5d58b6374' 2018-11-06 16:29:24 +00:00
josecoll
015a36dad6
CORDA 2131 - Extend Network Bootstrapper to enable registration of Java Package Namespaces. (#4116) 
* Package Ownership Network Parameters: add register / unregister CLI options to network bootstrapper.

* Fix 2 failing unit tests.

* Fix failing unit tests.

* Added changelog, documentation and cosmetic changes.

* Fixed exception message.

* Address PR review feedback.

* Fix typo.

* Resolve conflicts.

* Rebase, resolve conflicts and remove PackageOwner class.

* Address latest PR review feedback.

* Fix incorrect imports.

* Fix broken JUnit

* Add support for key store passwords including delimiter characters.

* Updated and improved documentation.

* Minor doc update.

* Documentation changes following PR review feedback

* Replace Bank Of Corda with Example CorDapp.
Remove references to locally built network bootstrapper.
 2018-11-06 09:28:55 +00:00
Anthony Keenan
b07cd38186
ENT-2534: Seperate database manager into commands (#1527) 
* Seperate database manager into commands

* Documentation update

* Slightly better naming

* Address review comments

* Review comments

* Address review comments
 2018-11-05 14:32:51 +00:00
Christian Sailer
07719489e4
ENT-2682 Fix cordapp layout for notaryhealthcheck (#1528) 
* Move state and command to contract.

* Rollback compiler.xml
 2018-11-02 15:39:14 +00:00
Michele Sollecito
ae8f26bd42
Merge pull request #1534 from corda/merges/02_11_2018_13_15 
[ENT-2678] PluginRegistrationTest is failing (fix) (OS part) (#4153)
 2018-11-02 13:31:34 +00:00
Michele Sollecito
6408b845b6 [ENT-2678] PluginRegistrationTest is failing (fix) (OS part) (#4153) 
(cherry picked from commit 24e9ceac484f3ed42a929a095010aed1d168db70)
 2018-11-02 13:18:36 +00:00
Michele Sollecito
24e9ceac48
[ENT-2678] PluginRegistrationTest is failing (fix) (OS part) (#4153) 2018-11-02 11:36:28 +00:00
Andrius Dagys
b9ff958011 ENT-1858: All non-bft notary services are now async 2018-11-02 11:12:46 +00:00
tudor.malene@gmail.com
d97d64d954 Merge remote-tracking branch 'open/master' into tudor-os-merge-1-11 
# Conflicts:
#	core/src/main/kotlin/net/corda/core/utilities/KotlinUtils.kt
#	core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt
#	docs/source/index.rst
#	node/src/integration-test/kotlin/net/corda/node/flows/FlowOverrideTests.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
 2018-11-01 16:58:28 +00:00
Anthony Keenan
7ca1dd5848
Fix issue where verbosity wasn't working on subcommands (#4147) 2018-11-01 11:34:14 +00:00
szymonsztuka
353c96375d Merge remote-tracking branch 'remotes/open/master' into merges/os-mere-2018-10-31 
# Conflicts:
#	README.md
#	docs/source/api-persistence.rst
#	docs/source/node-database.rst
 2018-10-31 18:08:59 +00:00
Stefano Franz
ab1deaac99
CORDA-1953 Display error when unable to open connection to Docker (#4136) 
* Display error when unable to open connection to Docker

* review comments
 2018-10-30 17:14:47 +00:00
szymonsztuka
fcd822f176 Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-2018-10-30 
# Conflicts:
#	docs/source/corda-configuration-file.rst
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
 2018-10-30 14:10:01 +00:00
Anthony Keenan
30fedec343
CORDA-1838: A few misc fixes (#4126) 
* Remove unused code

* Make comment readable

* Remove joptsimple from node/shell

* tabs vs whitespace
 2018-10-30 14:01:20 +00:00
Anthony Keenan
2ef1f1c7c4
Merge pull request #1505 from corda/anthony-os-merge-2018-10-24 
O/S Merge 24/10/2018
 2018-10-28 21:43:52 +00:00
Anthony Keenan
92184b47f6 Remove superfluous call 2018-10-28 14:54:24 +00:00
Christian Sailer
75aae261bd
Ent-1839 Performance Test Suite (#1501) 
* Add step to build performance test suite zip including LICENSE and README file.

* Build release package as part of the build

* blank lines/comment
 2018-10-26 18:29:40 +01:00
Stefano Franz
21afd256d5
ENT-2219 add option to automatically package migration scripts into a migratio… (#1508) 
* add option to automatically package migration scripts into a migration cordapp

* fix compile error

* add explict "OK" from user to create jar
add warning about possible data corruption
refactor check for --jar to be easier to read.
 2018-10-26 15:30:16 +01:00
Anthony Keenan
f72c63aba5 Fix compilation error 2018-10-26 14:39:26 +01:00
Anthony Keenan
235498086f Fix more merge issues 2018-10-26 13:46:03 +01:00
Anthony Keenan
08f32a9329 Merge remote-tracking branch 'open/master' into anthony-os-merge-2018-10-24 
# Conflicts:
#	build.gradle
#	core/src/main/kotlin/net/corda/core/internal/JarSignatureCollector.kt
#	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
#	docs/source/cli-ux-guidelines.rst
#	docs/source/testnet-explorer-corda.rst
#	finance/src/integration-test/kotlin/net/corda/finance/flows/test/CashConfigDataFlowTest.kt
#	finance/src/main/kotlin/net/corda/finance/flows/CashConfigDataFlow.kt
#	node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
#	node/src/main/kotlin/net/corda/node/Corda.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
#	tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
 2018-10-25 11:30:52 +01:00
Anthony Keenan
0ab644783e CORDA-1838: Add subcommands to node (#4091) 
* Tidy up

* Add install-shell-extensions command

* Make cli tests use same version of picocli as everything else

* Remove initLogging from NodeStartup, it is ran earlier by CordaCLIWrapper

* Use picocli snapshot for testing

* Use RunLast() parser to invoke correct subcommands

* Deprecate old clear-network-map-cache parameter

* Restructure NodeStartup for commands

* Get rid of -c option since the flag method has been deprecated and that didn't exist in last release

* Update documentation

* Update backwards compatibility test

* Get all subcommands working

* Refactor sub commands into seperate classes

* Update docs and fix some tests

* Docs changes

* Fix merge conflicts with master

* Fix renamed parameters

* Fix test failure

* Fix compatibility tests

* Add missing compatibility test for blob inspector

* Remove blob inspector compatibility test as there are import conflicts

* Assorted doc fixes

* Addressing review comments

* More review comments

* Couple more bits

* Fix broken tests

* Fix compilation error

* More merge conflicts

* Make startup logging function a bit more sensible

* Fix broken shell extensions

* Make shell extensions work with subcommands

* Make sure parameters for deprecated options are carried through

* More review comments

* Adding some s's

* One last go

* Fix compilation error on Windows

* Revert logging changes

* Revert docs back to their original imperatively moody state
 2018-10-24 13:58:19 +01:00
Christian Sailer
a8eb02855e
ENT-2579 Move sensitive data out of resources (#1492) 
* Move testplans and sensitive config out of resources into a new data directory. Required code/config changes for that to work.
Server RMI mappings are now mandatory on the cmd line when using ssh tunnels, no more defaults in the resources.

* Add sample test plans that show what we do without having any passwords or hostnames in them.

* Add more descriptions/comments to the sample test plans.
 2018-10-23 09:41:14 +01:00
Christian Sailer
d6c76c69aa
ENT-2553 Serialisation warnings in notary healthcheck (#1497) 
* Visibility settings and annotations to stop warnings when running notary healthcheck.

* Add progress trackers so the warnings about unstarted progress trackers disappear.
 2018-10-23 08:51:09 +01:00
Shams Asari
d3c5479826
CORDA-1621: The finance CorDapp uses the app config feature rather than the node's config (#4100) 2018-10-22 18:56:30 +01:00
Andrius Dagys
29443bf7fe CORDA-535: Move MySQL & JPA notary configurations out of node 2018-10-22 16:52:04 +01:00
szymonsztuka
a0b632f964 Merge OS -> ENT: added deduplicationId to execute method in classes overriding FlowAsyncOperation 2018-10-22 09:19:28 +01:00
rick.parker
b571e16d0d Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20181018-1 2018-10-19 08:02:59 +01:00
Rick Parker
55731ef816
ENT-2431 Tidy up buildNamed and CacheFactory 2018-10-18 10:38:43 +01:00
Stefano Franz
5ca26b1345 Merge remote-tracking branch 'open/master' into stefano-merge-201810171215 
# Conflicts:
#	docs/source/node-database.rst
 2018-10-17 13:49:00 +01:00
Stefano Franz
456c9a85e1
remove requirement to override default progress tracker for interacti… (#3985) 
* remove requirement to override default progress tracker for interactive shell - this is no longer needed

* fix failing tests
 2018-10-17 11:27:14 +01:00
Chris Rankin
430c4bcf83 Merge commit '47068e6b7ad0afb3ed8df61a429470f19331b7b5' into chrisr3-os-merf 
Conflicts:
	docs/source/index.rst
	finance/build.gradle
	finance/src/integration-test/kotlin/net/corda/finance/flows/test/CashConfigDataFlowTest.kt
	node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
	samples/simm-valuation-demo/build.gradle
 2018-10-16 12:07:55 +01:00
Christian Sailer
802c88e7ad
ENT-2565 Make JMeter capsule usable as client (#1464) 
* Make fat jar runnable as a client, improve handling of SSH parameters, fix up some dependencies.
*Note*: running the fat jar as a server now requires the -s cmd line flag.

* Picocli command class

* Add additional search paths argument

* Rewrite launcher to use PicoCLI arguments

* Fix printing of help

* fix tools:jmeter:run method to work with the new command line format.

* Fix printing of help message without jmeter throwing loads of exceptions around.

* Fix comments and add tests for non-trivial command line munging

* Code review

* Test for generated cmd line when running via gradle.

* Rewrite launcher to handle jmeterProperties and rmi server port config explicitly

* Modify ssh code to use properties passed in from JMeter launcher main.

* Fix test

* Transform server rmi local port to new format, fix/test reading.

* Fix up jmeter:run to match new command line paramters

* Formatting

* Include server-rmi.config in jar

* Code review
 2018-10-16 08:14:55 +01:00
Andrius Dagys
3981a88301 Merge branch 'open/master' into andrius/merge-10-15 2018-10-15 10:50:12 +01:00
Andrius Dagys
53473aedba A first iteration benchmark tool for consensus protocols. It lets you generate load 
at a specified rate and transaction size.
 2018-10-12 14:25:36 +01:00
Anthony Keenan
e3685f5e81
Make blobinspector not log to console by default (#4059) 2018-10-11 18:01:54 +02:00
Rick Parker
78907bd6dc
ENT-2367 Overnight benchmark enhancements (#1470) 2018-10-11 13:58:44 +01:00
Andrius Dagys
504cefc6f6 CORDA-535: Move MySQL notary into a separate module 2018-10-10 16:07:16 +01:00
Anthony Keenan
4b9dd514c2
Merge pull request #1469 from corda/anthonyk-os-merge-20181009 
O/S Merge 9/10/2018
 2018-10-10 11:00:25 +02:00
Viktor Kolomeyko
51ef38465c
ENT-2588: Add package net.corda.finance.schemas into the Finance CorDapp deployment. (#1468) 2018-10-09 20:01:39 +01:00
Anthony Keenan
a6fd2ba903 Merge remote-tracking branch 'open/master' into anthonyk-os-merge-20181009 
# Conflicts:
#	core/src/main/kotlin/net/corda/core/utilities/ByteArrays.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/KryoCheckpointSerializer.kt
 2018-10-09 16:15:59 +01:00
Anthony Keenan
9c8a1cd14a
CORDA-2028 - Fix use of required paramers/options on command line (#4040) 
* Make required parameters work with --install-shell-extensions and make errors look a bit more errorey

* Make blobinspector required parameter work the way it used to

* Fix compilation Error
 2018-10-09 15:49:24 +02:00
Dominic Fox
d9ea19855f
CORDA-2006: Simplify checkpoint serialization (#4042) 
* CORDA-2006: Simplify checkpoint serialization

* Supply rule to KryoTest
 2018-10-08 13:39:28 +01:00
Chris Rankin
4cb31f4c8b Merge commit '39434dcbecdd2cd656e40622530e84d02443b8e2' into chrisr3-os-merge 2018-10-08 10:42:55 +01:00
Shams Asari
39434dcbec
Assorted set of clean ups (#4039) 2018-10-05 18:05:10 +01:00