Commit Graph

10685 Commits

Author SHA1 Message Date
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
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
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
dfe581bac6 Merge pull request #384 from corda/andr3ej-os-merges
OS merges
2018-01-22 11:52:47 +00:00
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
3094e44115 Dump exception to System.err (#213) 2018-01-19 22:21:43 +00:00
a889a5bef1 Revert jolokiaVersion code. 2018-01-19 16:50:19 +00:00
6ddf684846 Fix compile errors. 2018-01-19 15:12:33 +00:00
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
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
16c3250669 Merge commit 'a3fd653affb01a660b2be31314866d8d1f1715de' into andr3ej-os-merges
# Conflicts:
#	docs/source/serialization.rst
2018-01-19 13:10:08 +00:00
5dc15b8032 Merge pull request #381 from corda/andr3ej-matthew-os-merge
Matthew OS merge
2018-01-19 08:52:57 +00:00
2f8836c8ad Some long overdue cleaning up of some of the doorman code. (#362) 2018-01-18 23:08:02 +00:00
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
e9f0c8eca8 Merge pull request #361 from corda/thomas-mysql-reconnect
Retry obtaining DB connection
2018-01-18 16:38:47 +00:00
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
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
a099f30e61 Merge pull request #377 from corda/andr3ej-entbot
Merge my conflicting changes from OS
2018-01-18 12:59:41 +00:00
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
f2f803ecd5 HSM signing of network parameters (#363)
Add HSM signing of network parameters
2018-01-18 12:05:18 +00:00
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
af21f6065d Fixing missing certificate (#373)
* Fixing missing certificate

* Addressing review comments
2018-01-18 11:15:11 +00:00
7bd2210d2f Merge pull request #374 from corda/christians/ENT-985-merge
ENT-985 NetworkMapCaching
2018-01-18 11:09:02 +00:00
299d9bef77 Minor: numbering update. 2018-01-18 11:03:41 +00:00
bbcafca959 Retire DatabaseTransactionManager. (#2385) 2018-01-18 10:11:34 +00:00
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
d9fb2ae4a8 Merge commit 'fca0afe5913d880628b9f94c459a04fb785b6c17' into christians/ENT-985-merge 2018-01-18 09:56:46 +00:00
619f333541 Merge pull request #2350 from corda/kat/docFix
Serialization documentation update
2018-01-17 22:14:43 +00:00
6733e74fcd Merge pull request #142 from corda/dl-design-admin-ui
Approved by Mike H
2018-01-17 17:56:08 +00:00
a3fd653aff Serialization documentation update 2018-01-17 17:54:13 +00:00
7a458323a0 Clarified some further points. 2018-01-17 17:54:13 +00:00
4248660017 Various grammar fixes and clarifications. 2018-01-17 17:54:13 +00:00
776289cb01 Corrects glossary. 2018-01-17 17:54:13 +00:00
c4bfc49d0c Updated main doc 2018-01-17 17:52:45 +00:00
fc4373ded7 Put near-term.md back (not sure why it got lost) 2018-01-17 17:50:10 +00:00
d19eb4a9d7 Removed useHTTPS from NodeConfiguration as it's not needed by the node. (#2375)
It's still expected to be present in node.conf if the web server needs to use SSL.
2018-01-17 17:47:40 +00:00
6edf95506b Rename the inbox (#2360)
Add changelog entry

Address review comments

Alternate solution to service queues

Fixup after merge
2018-01-17 16:06:31 +00:00
d0b62db0d2 Backported fix. (#2378) 2018-01-17 16:02:10 +00:00
0638f8c539 Adds Java code samples for versioning docs. 2018-01-17 15:21:00 +00:00
f52be47b48 Retry obtaining DB connection 2018-01-17 14:23:15 +00:00
ea57639a37 CORDA-924 Fix IntegrationTestingTutorial (#2349)
i.e. H2 startup bug. also:
* Fix poor connection pool discipline
* Log cleanup failures instead of replacing foreground failure
2018-01-17 14:23:13 +00:00
a19b213d7d Added conditional to disable tests when CORDA_DOCS_ONLY_BUILD envvar is present (#2371) 2018-01-17 13:08:00 +00:00
6e817f014d Adds default endpoints for the Corda development webserver. 2018-01-17 11:04:37 +00:00
fca0afe591 CORDA-928 Caching in the NetworkMapCache (#2358)
* CORDA-928 cache query results via `getPeerByLegalName` and `getNodesByIndentityKey` to avoid hitting the DB hard in RPC handling.

* Skip cache invalidation during init() - caches are still null.

* Remove registeredNodes/partyNodes caching of data feed.
Rewrite data feed to be initialised off the DB.
Add start method to trigger readyness/artemis listeners if there are nodes in the DB.

* Invalidate cache last rather than first when updating
2018-01-16 21:15:15 +00:00
52a6abefb5 Merge pull request #276 from corda/bogdan-date-to-localdatetime
replace java.Date with java.time
2018-01-16 19:53:08 +00:00
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
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
ee2fe71d0b Removed reference to 'enterprise' caused by incorrect auto-merge. 2018-01-16 16:30:11 +00:00
d247e643ae Minor: tweaks to the discussion of network parameters and network map. 2018-01-16 17:18:49 +01:00
646cd3e103 Updates versioning docs. 2018-01-16 15:29:26 +00:00