ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-29 09:18:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,770 Commits 91 Branches 405 Tags 354 MiB
1c77736d50
Commit Graph

1316 Commits

Author SHA1 Message Date
Patrick Kuo
1c77736d50 merge os to enterprise 2018-01-30 14:00:22 +00:00
Mike Hearn
d6f9721cb8
Docs: move serialisation into the CorDapp section. Fix some markup issues (#2429) 
* Docs: move serialisation into the CorDapp section. Fix some markup issues.

* Address review comments
 2018-01-30 10:59:03 +01:00
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
Joel Dudley
4851d9ca6a
Documents rationale for using cordapp, cordaRuntime and cordaCompile Gradle configs. 2018-01-29 12:42:31 +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
Matthew Nesbit
054c44d4bc Merge from OS to ENT including Bridge manager work 2018-01-26 16:55:43 +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
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
Joel Dudley
52ae34782d
Removes a reference to the bundled node webserver. 2018-01-24 16:41:49 +00: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
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
Michele Sollecito
142f52fa82
[CORDA:936]: Enable RPC layer to work with SSL 2018-01-23 16:23:37 +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
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
Austin Moothart
642b298d23 AWS marketplace getting started docs 2018-01-22 14:27:35 +00:00
Christian Sailer
8d5611853a
CORDA-929 Attachment caching (#2372) 
* ENT-1403 Cache node attachments (and attachment content)

* ENT-1403 Make cache sizes configurable

* Update documentation with new config parameters

* Test that non-existence of attachments is not cached

* Remove unneeded defaults in interface

* It turned out we need the defaults on the interface in quite a few tests

* Codereview: typos, size in MB rather than bytes, charset in tests, move concurrencyLevel to a constant

* Codereview: Make the internal config value bytes again, but config file in MB

* Fix example config unit test
 2018-01-22 13:41:06 +00:00
Andrzej Cichocki
1fc646cfa8 CORDA-716 Move test-utils and node-driver to stable API section in docs (#2335) 
* Move test-utils and node-driver to stable section.

* Move FlowStackSnapshotFactory to testing.services package & update docs

* Move SerializationTestHelpers to testing.core package

* Move TestConstants.kt to core namespace

* Move Expect.kt to core namespace

* Move CoreTestUtils to core.TestUtils - rename class and update imports

* Added some clarification to documents after re-reading them

* Added static imports

* Removing unused import

* Fix merge conflict

* Fixing merge conflict
 2018-01-22 11:28:41 +00:00
Joel Dudley
cfc5c6709a
Fixes formatting. 2018-01-19 13:43:17 +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
Joel Dudley
87b00fde7d
Better instructions for building against master. 2018-01-19 11:47:19 +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
Joel Dudley
4d4f12d598
Reworks upgrade notes to improve structure and style. 2018-01-18 11:10:52 +00:00
Joel Dudley
038c4eb615
Removes cli vs ide from quickstart. Adds link to new utilities page. 2018-01-18 11:04:07 +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
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
Shams Asari
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
Matthew Nesbit
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
Joel Dudley
0638f8c539
Adds Java code samples for versioning docs. 2018-01-17 15:21:00 +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