Commit Graph

1275 Commits

Author SHA1 Message Date
Christian Sailer
d9fb2ae4a8 Merge commit 'fca0afe5913d880628b9f94c459a04fb785b6c17' into christians/ENT-985-merge 2018-01-18 09:56:46 +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
David Lee
c4bfc49d0c Updated main doc 2018-01-17 17:52:45 +00:00
David Lee
fc4373ded7 Put near-term.md back (not sure why it got lost) 2018-01-17 17:50:10 +00:00
josecoll
a3436160cf Monitoring and Logging Design document (#129)
* WIP draft of Monitoring and Logging design document (JIRA ENT-1109)

Added missing diagram.

Minor updates and reshuffle: Michele's proposal is an architectural/design implementation detail (not a solution in its own right).

Completed technical implementation detail.

Moved Design Decision signoff to top.
Moved current state of logging and reporting to Appendix.

WIP ...

Listed additional metrics to add.

Minor update to proposed solutions activities.

* Incorporating feedback following review by RGB.

* Incorporating feedback following review by MS.

* Added details about Artemis logging.

* Clarified usage of SLF4J

* Updated Design Decisions matrix.

* Decision point: should LOG4J2 output be separated for Corda Node vs CorDapps.
Clarify additional effort required in logging.
Minor reformatting for clarify.

* Clarifications following review feedback from WN

* Incorporating minor clarifications and feedback from WN.

* Incorporating Auditing requirements following conversation with Andrey.

* Updated following review feedback from MH.
2018-01-16 18:03:18 +00:00
josecoll
c7ae92c103
Merge pull request #352 from corda/colljos-merge-release3-dp-master
Merge from R3 Corda 3.0 Dev Preview release branch to master
2018-01-16 17:33:28 +00:00
Mike Hearn
d247e643ae Minor: tweaks to the discussion of network parameters and network map. 2018-01-16 17:18:49 +01:00
Joel Dudley
646cd3e103
Updates versioning docs. 2018-01-16 15:29:26 +00:00
Andrey Brozhko
9035a0521b ENT-1407 changing the docs logo. 2018-01-16 15:02:52 +00:00
josecoll
eb9a51af75 Merge branch 'master' into colljos-merge-release3-dp-master 2018-01-16 14:28:07 +00:00
josecoll
eb3798da5e Merge remote-tracking branch 'open/master' into colljos-merge-160118 2018-01-16 12:13:49 +00:00
josecoll
24bf6df868 Merge branch 'master' into colljos-merge-release3-dp-master 2018-01-16 09:58:51 +00:00
David Lee
90021f9002
Merge pull request #105 from corda/dl-hadr-design-doc
HA/DR design doc by Matthew Nesbit
2018-01-16 09:32:15 +00:00
Anthony Keenan
1367cd4adb
CORDA-912 Stop exposing internal node user, create user in testing infrastructu… (#2361)
* Stop exposing internal node user, create user in testing infrastructure instead

* Update kdocs
2018-01-15 19:30:33 +00:00
David Lee
e817c95a78
Fixed typo; corrected note to 'certain databases' 2018-01-15 18:49:19 +00:00
David Lee
895b745c37
Added missing spaces 2018-01-15 18:47:17 +00:00
David Lee
d390716a9b
Added goals/non-goals headers; fixed typo 2018-01-15 18:45:30 +00:00
David Lee
788d88c8fd
Fixed typo 2018-01-15 18:42:55 +00:00
Mike Hearn
094e96d303 Move the CommercialPaperTest examples to a location where it'll be run by gradle/ci. Make sure the tests pass, even the example tests that are intended to fail, so these files are kept up to date as the code changes. 2018-01-15 17:56:21 +01:00
josecoll
15ffc85712 Reverted labels back to "master". 2018-01-13 11:16:51 +00:00
josecoll
729aa65e7f Merge from R3 Corda 3.0 Dev Preview release branch to master 2018-01-13 11:00:01 +00:00
Joel Dudley
29b52f66dc
Updates the documentation on versioning. 2018-01-12 10:20:24 +00:00
Shams Asari
c71ef3139b Merge remote-tracking branch 'open/master' into shams-os-merge-120118
# Conflicts:
#	core/src/main/kotlin/net/corda/core/schemas/CommonSchema.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkMap.kt
#	node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/internal/vault/DummyDealStateSchemaV1.kt
2018-01-12 08:06:44 +00:00
Shams Asari
bbfbb08c43
CORDA-881: Signed network parameters has the network map cert attached to it instead of just the public key. (#2346)
Introduced DigitalSignatureWithCert and SignedDataWithCert as internal APIs, with the expectation that they will become public; renamed the network parameters end-point to network-parameters; updated the network-map.rst doc; and did some refactoring.
2018-01-12 07:59:08 +00:00
Tudor Malene
d6235cb937 [ENT-1364]: add documentation around liquibase and CorDapps (#322) (#341)
* [ENT-1364]: add documentation around liquibase and CorDapps

* [ENT-1364]: add documentation around liquibase and CorDapps

* [ENT-1364]: add documentation around liquibase and CorDapps

* [ENT-1364]: formatting

* [ENT-1364]: formatting

* [ENT-1364]: formatting

* PR changes

* [ENT-1364]: added more clarifications
2018-01-11 15:41:46 +00:00
Michal Kit
4caf6d92ea
ENT-1350 unifying the config-file command line argument (#333)
* ENT-1350 unifying the config-file command line argument

* Changing README.md
2018-01-10 16:27:59 +00:00
Tudor Malene
c2bd7403a8
hibernate mapping changes (#2337)
* add foreign key names and move the participants mapping to the subclass so that the table name can be configured

* update api-current file

* fix compilation errors

* PR changes

* PR changes
2018-01-10 11:42:08 +00:00
Katelyn Baker
cacdba872e
CORDA-908 - Support private properties in AMQP serialization (#2336)
CORDA-908 - Support private properties in AMQP serialization

* Review comments

* Fix tests

* Review Comments

* review comments

* review comments
2018-01-10 11:41:49 +00:00
Tudor Malene
12546c0a7c
[ENT-1281]: Disable database.runMigration by default and enforce database version on startup. (#264)
* [ENT-1281]: set database.runMigration=false by default and add state check at startup

* [ENT-1281]: attempt to fix tests

* [ENT-1281]: attempt to fix tests

* [ENT-1281]: set runMigration=true in the cordformation plugin

* [ENT-1281]: attempt to fix tests

* [ENT-1281]: attempt to fix tests

* [ENT-1281]: attempt to fix tests

* [ENT-1281]: fix formatting

* [ENT-1281]: typo and javadocs

* [ENT-1281]: small refactoring and added test for SchemaMigration

* [ENT-1281]: update documentation to reflect changes

* [ENT-1281]: fix tests after merge

* [ENT-1339]: for h2, allow schemas without migrations to run (#294)

* [ENT-1339]: for h2, allow schemas without migrations to run

* [ENT-1339]: fix various migration issues and change author name

* [ENT-1339]: add naming convention for migrations

* [ENT-1339]: change naming convention to use hyphens

* [ENT-1339]: change mapping of participants to be able to control the table name

* [ENT-1339]: change FK names to <=30 for oracle 11g compatibility

* [ENT-1339]: cmd line argument for migrations made consistent

* [ENT-1339]: revert abstract state superclasses

* Update db integration test setup - new tables.

* Update db integration test setup - new tables.

* [ENT-1339]: remove final from participants to allow table name config

* [ENT-1339]: shortened pk

* [ENT-1339]: revert constructor

* [ENT-1339]: change getMigrationResource api to Nullable

* fix compile error

* [ENT-1281]: fix tests after merge

* [ENT-1281]: fix tests after merge
2018-01-10 11:32:24 +00:00
igor nitto
4a995870c8
Fix example-node.conf in docs (#2334) 2018-01-08 17:50:29 +00:00
Shams Asari
bbcdb639ab
Merge pull request #317 from corda/shams-os-merge-080118
Shams O/S merge 080118
2018-01-08 14:43:48 +00:00
szymonsztuka
f2186e7e30
Enable database integration tests against Postgres database (#169)
* For Postgres, if a schema name is provided then it's wrapped in double quotes before passing to Hibernate to preserve case-sensitivity, Liquibase does it out-of-box.
* Sql setup scripts for PostgreSQL and datasource configuration.
2018-01-08 14:05:42 +00:00
Shams Asari
a94f99781a Merge remote-tracking branch 'open/master' into shams-os-merge-080118
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt
#	node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
2018-01-08 13:43:10 +00:00
Katelyn Baker
83a0a2fa3c
Enum evolution documentation (#2189)
* CORDA-553 - Documentation

* CORDA-553 - Documentation

* Review comments

* review comments

* DOCUMENTATION: Serilization docs review updates
2018-01-05 19:30:17 +00:00
Katelyn Baker
6a07576c96
CORDA-834 - Class default evolution serialisation documentation (#2209)
CORDA-834 - Class default evolution serialisation documentation
2018-01-05 17:44:53 +00:00
Katelyn Baker
e2286a75e5
CORDA-902 - Serialization documentation (#2323)
CORDA-902 - Serialization documentation
2018-01-05 17:34:32 +00:00
Shams Asari
1e9e1a61d9 Moved IntegrationTest class into internal package 2018-01-04 22:08:16 +00:00
Shams Asari
13619df0b1 Merge remote-tracking branch 'open/master' into shams-os-merge-040118
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt
2018-01-04 10:58:44 +00:00
Shams Asari
d84105b60e
Using X509Certificate consistently throughout, rather than BC's X509CertificateHolder. (#2305)
The later is now only used where needed. This has reduced the amount of converting we have to do back and forth.
2018-01-03 22:00:39 +00:00
Joel Dudley
c1874cbd62
Fixes a broken link to the shell page. 2018-01-03 10:00:33 +00:00
Shams Asari
52173219c3 Merge remote-tracking branch 'open/master' into shams-os-merge-020118
# Conflicts:
#	client/rpc/src/integration-test/java/net/corda/client/rpc/CordaRPCJavaClientTest.java
#	node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
#	node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.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/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
#	node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
2018-01-02 15:32:32 +00:00
Anthony Keenan
1d66fe9296
[CORDA-879] Generate node directories as part of bootstrapping (#2285)
* Generate node directories as part of bootstrapping

* Include latest corda.jar in bootstrapper package
Remove SLF4J warnings on startup

* Changes post review

* More review changes

* Review changes

* Making docs clearer
2017-12-23 11:22:31 +00:00
Joel Dudley
5a50f564c9
Improvements to the shell docs. 2017-12-21 16:57:03 +00:00
Joel Dudley
7f1b61d34b
Adds a caveat regarding the inability to record a transaction twice. 2017-12-21 14:42:18 +00:00
Alberto Arri
6db0490750
Fix node integration tests. (#2233)
* Add tests for node registration and communication
2017-12-21 11:48:00 +00:00
Joel Dudley
ff8d0881b3
Improves CorDapp dependency docs. 2017-12-21 11:22:32 +00:00
Michele Sollecito
0711ad34e3
[ENT-850]: RPC function to kill a flow (#215)
* Tentative API and implementation.

* Tests completed. API update needed.

* Updated api-current.txt. Some previous changes hadn't been reflected and now they are.

* Improved the tests.

* Some code review changes.

* Merge branch 'master' into features/ENT-850

# Conflicts:
#	.ci/api-current.txt

* Code review changes.

* Code review changes.
2017-12-20 19:16:54 +00:00
Shams Asari
97fac8e988 Merge branch 'master' into shams-os-merge-201217 2017-12-20 13:16:30 +00:00
Shams Asari
d48bc41a7c Revert "Shams os merge 191217 (#223)"
This reverts commit 2461421
2017-12-20 13:01:19 +00:00
Viktor Kolomeyko
c2b10a1882 Business Network design document (#204)
* Design doc (unfinished).

* Design doc, requirements completed.

* Design doc, more content and the diagram.

* Design doc, more content.

* Design doc, minor changes.

* Changes following review from @davidleeuk

* Changes following review from @gendal

* Changes following review from @shamsasari
2017-12-20 12:07:42 +00:00