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,603 Commits 99 Branches 407 Tags
Commit Graph

2236 Commits

Author SHA1 Message Date
Shams Asari
fab0c5cd2c
Merge pull request #1561 from corda/os-merge-99e9864 
O/S merge 99e9864
 2018-11-12 12:37:31 +00:00
Matthew Nesbit
d54e63e356
Merge pull request #1554 from corda/mnesbit-bully-leader 
ENT-2705: A Bully Algorithm Leader Elector for the Bridge
 2018-11-12 09:41:50 +00:00
bpaunescu
7fbe8e7de7
renamed external artemis config properties for consistency (#1555) 2018-11-09 16:47:12 +00:00
Shams Asari
4801942a87 Merge branch 'merge-99e9864' into os-merge-99e9864 
# Conflicts:
#	.gitignore
#	.idea/codeStyles/Project.xml
 2018-11-09 14:53:26 +00:00
Matthew Nesbit
51e9ef0cc0 Initial stage of Bully Algorithm Leader election 
Some artemis reconnect logic

Fix disconnect behaviour of BullyLeader code and improve Artemis shutdown behaviour when disconnected.

Integrate Bully Algorithm leader elector with the bridge

Fix docs

Remove pointless header change
 2018-11-09 09:34:44 +00:00
Anthony Keenan
8d794bd525
Update node.conf samples (#4189) 2018-11-09 08:04:38 +00:00
Michele Sollecito
11c7c879eb Merge remote-tracking branch 'remotes/open/master' into merges/08_11_2018_16_05 
# Conflicts:
#	docs/source/corda-configuration-file.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
 2018-11-08 16:39:09 +00:00
Michele Sollecito
6c749889d0
[CORDA-1993]: Replace reflection-based NodeConfiguration parsing with versioned property-based parsing mechanism. (#4132) 2018-11-08 15:56:00 +00:00
szymonsztuka
bac265d418
Merge pull request #1548 from corda/merges/os-merge-to-ecbf23a 
Merge OS ->ENT to ecbf23a.
 2018-11-08 12:02:31 +00:00
Joel Dudley
99f6cc9e65
Updates tutorial to match template changes. (#4201) 2018-11-08 11:30:04 +00:00
Joel Dudley
9c508673cf
Updates tutorial to match template changes. (#4170) 
* Updates tutorial to match template changes.

* Updates hello, world tutorials to match new template structures.
 2018-11-08 10:19:03 +00:00
Viktor Kolomeyko
400346fff0
ENT-2669: Introduce option for HTTP proxy for outbound Bridge connectivity (#1537) 
* ENT-2669: Introduce option for HTTP proxy for outbound Bridge connectivity

One of our customers currently using HTTP proxy without which outbound connection from Corda Node cannot be established.
Also, propagate `trace` setting correctly down the Bridge stack.

* ENT-2669: Compilation fixes.

* ENT-2669: Revert deleted constructor back.

* ENT-2669: First stub on HTTP Proxy integration test.

* ENT-2669: Minor changes.

* ENT-2669: Reduce test to bare minimum.

* ENT-2669: Attempt to write own HttpProxy.

* ENT-2669: Another attempt to make programmatic HttpProxy work.

* ENT-2697: Disable DNS resolution before sending requests to proxies.

* ENT-2669: Switch to use Jetty HttpProxy for integration testing.

* Adds a pipeline logger ahead of the proxy stage if trace is set. The logging is removed once the proxy completes.

Define a constant for pipeline stage.
 2018-11-08 09:04:36 +00:00
szymonsztuka
44dfa23ad5 Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-to-ecbf23a 2018-11-07 18:17:29 +00:00
szymonsztuka
e956c0f5fe
Docs - link from the page about signing Cordapp to the page about node configuration regarding enabling Cordapp signed by dev key to be run in production mode (related to CORDA-1915). (#4172) 2018-11-07 16:48:31 +00:00
Stefano Franz
ba9852bbe9
add documentation for initiating flow modification (#4180) 2018-11-07 11:40:10 +01:00
josecoll
356941a733 Merge commit '015a36dad67998236eda7e45309e66e5d58b6374' 2018-11-06 16:29:24 +00:00
Christian Sailer
4d335843b2 Remove blank line and formatting 2018-11-06 11:27:18 +00:00
Christian Sailer
bbb26bc6ba Merge commit '3260d9f2c419463fb68178ce70633dd34079bd1e' into christians/merge_3260d9f 2018-11-06 11:20:55 +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
e52f4bc2a7
Fixed a missing file error when building docs (#4167) 2018-11-06 09:12:13 +00:00
James Brown
035c84ce2a
CORDA-2169 Update requests dependency to latest/secure version (#4138) 
Requests library in docs/requirements is vulnerable. Bump to latest version (2.20.0)
 2018-11-06 08:58:22 +00:00
Joel Dudley
8b2ab41057
Updated network docs (#4154) 
* Renaming and reordering to help users navigate the Networks section.

* Split of pages between bootstrapped, existing and dynamic compatibility zones. Reintegrates Mike H content about creating a dynamic zone.

* Address review feedback except BNO point.

* Documents BNO app.

* Better docs of networkServices config option. Better comments of NetworkParameters fields.

* Documents additional network map protocol endpoint.

* Address review feedback.

* Addresses Kostas review feedback.

* Update protocol due to bug.

* Addresses Kostas's review feedback.

* Addresses Kostas's review feedback.
 2018-11-05 15:51:42 +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
Joel Dudley
9fcf15e825
Fixes headers to correctly render in side-bar. (#4165) 2018-11-05 14:11:40 +00:00
Roger Willis
80591bc6fd
StatePointer (#4074) 
* Introducing linear pointer.

* Added design document.
Added StatePointer interface.
Updated design document.
Updated StatePointer implementation.
Added doc section for state pointer.

* Updated design document.
Added API for StatePointer.

* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update docs/source/design/linear-pointer/design.md

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Update docs/source/design/linear-pointer/design.md

Co-Authored-By: roger3cev <roger.willis@r3cev.com>

* Resolve pointers
Added test to check pointers are resolved.
Updated docs and kdocs.
Reverted changes to api-current.txt
Revert "Reverted changes to api-current.txt"
This reverts commit dc1cece91a595a4e772f63917b830c7e1fd0586d.
Fix CI bug.
Made StatePointers type safe.
Resolving StatePointers is now optionally recursive
Addressed review comments.

Fixed compile error.

Addressed review comments.

Fixed bug in state pointer search.
Improved efficiency of state pointer search.

Removed whitespace.

TxBuilder logs warning when no service hub is supplied for resolving pointers as opposed to throwing an exception.

* Addressed review comments.
 2018-11-05 10:33:26 +00:00
Christian Sailer
3260d9f2c4
CORDA-1489 Exposure of node internals in mock network (#4130) 
* Introduce public subset of config to tweak config via mock net work without exposing internal node config.

* Removal of functions exposing (internal) NodeConfiguration from the public test API

* Code review fixes

* Blank lines removed

* Documented mock network API change in upgrade notes.

* Updated documentation and API doc.

* More documentation/API doc
 2018-11-05 09:29:05 +00:00
Viktor Kolomeyko
513305ee7d
ENT-2669: SocksProxy rename into Proxy (#1533) 
* ENT-2669: Rename SocksProxyVersion into ProxyVersion

* ENT-2669: Rename SocksProxyConfig into ProxyConfig

Update documentation and make code changes such that old style configs are still parsed.

* ENT-2669: Changelog update
 2018-11-02 16:07:41 +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
Cais Manai
b0771d6f2b Fixing a single typo (#4152) 
changing "areshared" to "are shared"
 2018-11-01 16:53:47 +00:00
Joel Dudley
b444701d7e
Formatting issue (#4150) 2018-11-01 16:47:50 +00:00
Joel Dudley
722fa31fb6
Documents waitForLedgerCommit. Clean-up. (#4144) 2018-11-01 15:23:47 +00:00
James Carlyle
88782f7544
Merge pull request #4143 from corda/james-corda-network-1 
James corda network 1
 2018-10-31 21:17:53 +00:00
jamescarlyle
2cdcbc8ead Updated with governance-guidelines and minor edits to other governance documents. 2018-10-31 19:58:21 +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
szymonsztuka
7cb9e174a9
Documentation for CORDA-1915 Build system for jarsigner (#4006) 
Documenting new cordapp and conformation plugins capabilities to sign CorDapp JAR, enabled by corda-gradle-plugins releases 4.0.32 and 4.0.33.
 2018-10-31 16:20:11 +00:00
szymonsztuka
437a053037
Minor docs update - Persistence API and node database (#4061) 
Note about database considerations regarding Cordapp compatibility between OS and ENT.
Remove database configuration "schema" as this is not implemented in OS, it was already mentioned as ignored for SQL server.
 2018-10-31 14:39:22 +00:00
James Carlyle
62399d04c7 Removed personal tone ('we'/'R3') from docs, in keeping with rest of documentation. 2018-10-31 09:17:21 +00:00
James Carlyle
3a20e3f208 Updated with governance-guidelines and minor edits to other governance documents. 2018-10-30 19:27:40 +00:00
Joel Dudley
7eca7515d6
Clarifies that only one serialisation mechanism is required. Clarifies dependencies required for Client RPC. (#4135) 
* Makes it clear that only one serialisation mechanism is required. Clarifies dependencies required for Client RPC.

* Addresses review feedback.
 2018-10-30 18:06:01 +00:00
szymonsztuka
518577b479
ENT-2580 Database docs improvements - permission for Oracle, remove tables no longer in use (#1474) 
Database documentation updates:
Unused tables or ones related to network-services were removed from scripts in docs.
Added quota/tablespace when creating users in Oracle - as reported in https://r3-cev.atlassian.net/browse/ENT-2580 UNLIMITED is not required.
List all tables for granting permissions when setting read only user in Oracle and fix typo
Fix typo for SQL Server.
Improve example of vendor specific DDL requirements.
 2018-10-30 16:34:51 +00:00
Michele Sollecito
149ce925bb
Merge pull request #1515 from roastario/add_notes_about_openjdk 
ENT-2656 add explicit warnings about openJDK being unsupported
 2018-10-30 15:57:34 +00:00
Stefano Franz
4bfdcd5ae1 add explicit warnings about openJDK being unsupported 2018-10-30 15:03:01 +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
szymonsztuka
1de56550b0
Optionally allow the node in production mode to accept Cordapps signed by dev Key (CORDA-1915) (#4133) 
By default Cordaps build by corda-gradle-plugins are signed by Corda development key.
In dev mode any key can be used to sign Cordapp JAR .
In production node Corda dev keys were forbidden. This code change allows to opt-out by setting node option cordappSignerKeyFingerprintBlacklist=[] or specify more public keys to blacklist.
The option is used in production only mode.
 2018-10-30 13:53:01 +00:00
Christian Sailer
1a9e7ab1ef
ENT-2578 Initial documentation for performance test suite (#1489) 
* Initial introduction for performance test documentation

* Describing tests

* Some more doc structure

* Correct protocoll (rmi) for remote jMeter

* Remote connection/ssh tunneling

* Corda wrapper and arguments

* jMeter GUI

* rmi -> RMI

* headless jmeter

* Sampler descriptions

* SamplerClient interface and CashPaySampler

* Testplans

* Minor changes/typos

* Installation page and moved to development for now.

* Some clarifications

* fixes

* reproducing r3 perf runs

* Add todos/tickets for missing bits in the documentation.

* Information on reproducing the test cluster

* Edit TODOs

* Small fix to server installation

* Spelling of JMeter

* Small Typos

* More minor review fixes

* More minor review fixes

* Capitalisation

* CorDapp spelling

* Review fixes

* typo

* Remove blank lines

* typo

* Describe r3 test set-up

* Performance network topology

* Describe included test plans

* Some lines on creating testplans

* Fix spelling of command line flags

* Minor review fixes

* typo

* Clarify server set-up

* typo
 2018-10-30 09:14:05 +00:00
jamescarlyle
83d6cb8e09 Initial commit 2018-10-29 13:51:10 +00:00
Michele Sollecito
db36709eab Merge remote-tracking branch 'remotes/open/master' into merges/29_10_2018_13_40 
# Conflicts:
#	.idea/compiler.xml
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
 2018-10-29 13:45:47 +00:00
Michele Sollecito
6022cecca5
[CORDA-1763]: Add node CLI option for validating configuration. (#4121) 2018-10-29 13:33:43 +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
06fcf24f87 Update enterprise testnet instructions 2018-10-26 13:46:03 +01:00