ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-27 08:22:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,702 Commits 91 Branches 405 Tags 354 MiB
83ea4611ca
Commit Graph

10702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Tudor Malene
c81e597199
Fix liquibase files after node split (#393) 2018-01-23 15:06:21 +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
Viktor Kolomeyko
743f514fd9 High Level Design decisions for Business Network (#369) 
* ENT-1331: Placeholder for design decisions previously discussed.

* ENT-1331: Describe TLS approach.

* ENT-1331: Describe Membership approach.

* ENT-1331: Describe Node vs. CordApp membership approaches.

* ENT-1331: Including remarks/corrections from @josecoll

* ENT-1331: Including remarks/corrections from @josecoll, part 2
 2018-01-22 15:33:04 +00:00
josecoll
00a7172e4b Resolve conflict after merge from master. 2018-01-22 14:39:29 +00:00
josecoll
4bff002b41 Merge branch 'master' into colljos-schema-split-for-notaries 2018-01-22 14:36:27 +00:00
Michal Kit
e1098dee4b
Adding public key constraint (#319) 
* ENT-1356 Adding public key constraint

* Addressing review comments

* Removing SERIALIZABLE from transaction

* Adding stashed changes

* Removing SERIALIZABLE from node info storage

* Addressing review comments

* Addressing possible certificate inconsitency (design gap) + clearing whole database for new liquibase changeset

* Addressing review comments
 2018-01-22 14:10:33 +00:00
Michal Kit
cee975c1c1
Reverting schema changes and following the liquibase change tracking … (#385) 
* Reverting schema changes and following the liquibase change tracking flow

* Addressing review comments

* Adding other tables cleanup

* Renaming the changeset file
 2018-01-22 12:11:31 +00:00
Andrzej Cichocki
dfe581bac6
Merge pull request #384 from corda/andr3ej-os-merges 
OS merges
 2018-01-22 11:52:47 +00:00
Patrick Kuo
43604ed212
Handle rejected jira issues in doorman (#371) 
* handle reject status from jira - WIP

* fix up after rebase

* address PR issue and fix build error after rebase
 2018-01-22 10:45:25 +00:00
Ross Nicoll
3094e44115 Dump exception to System.err (#213) 2018-01-19 22:21:43 +00:00
Andrzej Cichocki
a889a5bef1
Revert jolokiaVersion code. 2018-01-19 16:50:19 +00:00
Andrzej Cichocki
6ddf684846
Fix compile errors. 2018-01-19 15:12:33 +00:00
Andrzej Cichocki
bd342a690c
Merge commit 'bbcafca959b2d468a6f4f9bb847a1bbb7bfc9fdc' into andr3ej-os-merges 
# Conflicts:
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/DatabaseTransaction.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt
 2018-01-19 13:46:27 +00:00
Andrzej Cichocki
7ac1cbd379
Merge commit 'e699dad076fc1d81b8bd9529747e2922728ce2e0' into andr3ej-os-merges 
# Conflicts:
#	node/src/test/kotlin/net/corda/node/services/transactions/DistributedImmutableMapTests.kt
#	node/src/test/kotlin/net/corda/node/services/transactions/PersistentUniquenessProviderTests.kt
 2018-01-19 13:40:16 +00:00
Andrzej Cichocki
16c3250669
Merge commit 'a3fd653affb01a660b2be31314866d8d1f1715de' into andr3ej-os-merges 
# Conflicts:
#	docs/source/serialization.rst
 2018-01-19 13:10:08 +00:00
Matthew Nesbit
5dc15b8032
Merge pull request #381 from corda/andr3ej-matthew-os-merge 
Matthew OS merge
 2018-01-19 08:52:57 +00:00
Shams Asari
2f8836c8ad
Some long overdue cleaning up of some of the doorman code. (#362) 2018-01-18 23:08:02 +00:00
Andrzej Cichocki
f3c5ae2ff6
Merge commit '6edf95506bb2bd96ebffade9b9dd82d468cd4252' into enterprise 
# Conflicts:
#	docs/source/changelog.rst
#	node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
 2018-01-18 16:48:05 +00:00
Thomas Schroeter
e9f0c8eca8
Merge pull request #361 from corda/thomas-mysql-reconnect 
Retry obtaining DB connection
 2018-01-18 16:38:47 +00:00
Katarzyna Streich
133cf13674
Remove primary key constraint on host and port (#336) 
* Remove primary key constraint on DBHostAndPort

* Update migration file
 2018-01-18 16:24:06 +00:00
josecoll
a148835787 Added migrationResource for Notary schemas, and split out original liquibase node-services changelogs into node-core and node-notary 2018-01-18 15:21:55 +00:00
Katelyn Baker
9575381733
Merge pull request #378 from corda/clint/compilerxml-fixupdate 
Added -parameters as an additional command line options to revert it …
 2018-01-18 15:03:15 +00:00
Andrzej Cichocki
a099f30e61
Merge pull request #377 from corda/andr3ej-entbot 
Merge my conflicting changes from OS
 2018-01-18 12:59:41 +00:00
Clinton Alexander
ccae3acf7e Added -parameters as an additional command line options to revert it being removed during a merge. 2018-01-18 12:31:56 +00:00
Katarzyna Streich
f2f803ecd5
HSM signing of network parameters (#363) 
Add HSM signing of network parameters
 2018-01-18 12:05:18 +00:00
Andrzej Cichocki
42e1a38c6b
Merge commit 'ea57639a378fa45f0aef6930bc4450d0bbfaa5f4' into andr3ej-entbot 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
 2018-01-18 11:15:14 +00:00
Michal Kit
af21f6065d
Fixing missing certificate (#373) 
* Fixing missing certificate

* Addressing review comments
 2018-01-18 11:15:11 +00:00
Christian Sailer
7bd2210d2f
Merge pull request #374 from corda/christians/ENT-985-merge 
ENT-985 NetworkMapCaching
 2018-01-18 11:09:02 +00:00
Viktor Kolomeyko
299d9bef77 Minor: numbering update. 2018-01-18 11:03:41 +00:00
Andrzej Cichocki
bbcafca959
Retire DatabaseTransactionManager. (#2385) 2018-01-18 10:11:34 +00:00
josecoll
e699dad076
CORDA-917 Bootstrap nodes without Notary schemas (by default) (#2376) 
* Default jolokia version with optional override in CorDapp project gradle file.

* Bootstrap a node without Notary schemas by default.

* Revert unrelated Jolokia code change.

* Revert unrelated Jolokia code change.

* Addressed PR review feedback.
 2018-01-18 10:10:06 +00:00
Christian Sailer
d9fb2ae4a8 Merge commit 'fca0afe5913d880628b9f94c459a04fb785b6c17' into christians/ENT-985-merge 2018-01-18 09:56:46 +00:00
Katelyn Baker
619f333541
Merge pull request #2350 from corda/kat/docFix 
Serialization documentation update
 2018-01-17 22:14:43 +00:00
David Lee
6733e74fcd
Merge pull request #142 from corda/dl-design-admin-ui 
Approved by Mike H
 2018-01-17 17:56:08 +00:00
Katelyn Baker
a3fd653aff Serialization documentation update 2018-01-17 17:54:13 +00:00
joeldudleyr3
7a458323a0 Clarified some further points. 2018-01-17 17:54:13 +00:00
joeldudleyr3
4248660017 Various grammar fixes and clarifications. 2018-01-17 17:54:13 +00:00
joeldudleyr3
776289cb01 Corrects glossary. 2018-01-17 17:54:13 +00:00