Commit Graph

13565 Commits

Author SHA1 Message Date
6408b845b6 [ENT-2678] PluginRegistrationTest is failing (fix) (OS part) (#4153)
(cherry picked from commit 24e9ceac48)
2018-11-02 13:18:36 +00:00
c0c997f6ce Merge pull request #1532 from corda/andrius/merge-11-02
Andrius/merge 11 02
2018-11-02 13:13:11 +00:00
094eb266a8 [CORDA-2174] Fix demo node startup (#4151)
- Make issuableCurrencies config optional

- Allow additionalCordapps to override cordappsForAllNodes

In driver DSL when passing additionalCordapps to startNode and
one of the CordApps is also in cordappsForAllNodes will lead to confilc.
This commit is resolving the conflict by using the CordApp provided
by additionalCordapps
2018-11-02 11:44:18 +00:00
24e9ceac48 [ENT-2678] PluginRegistrationTest is failing (fix) (OS part) (#4153) 2018-11-02 11:36:28 +00:00
b9ff958011 ENT-1858: All non-bft notary services are now async 2018-11-02 11:12:46 +00:00
b1502c98f8 ENT-2681: Ensure we can parse old style bridge configs. (#1529)
* ENT-2681: Ensure we can parse old style bridge configs.

* ENT-2681: Minor change

* ENT-2681: Minor change
2018-11-02 10:45:52 +00:00
539fac0d57 Merge remote-tracking branch 'open/master' into andrius/merge-11-02 2018-11-02 09:08:03 +00:00
8814a087ed Merge pull request #1530 from corda/tudor-os-merge-1-11
Tudor os merge 1 11
2018-11-02 08:56:36 +00:00
66116e8d20 ENT-1858: Notary cleanup (#4134)
* Migrated all non-BFT notary implementations to use async commits.

* Mock network: await for async operation completion. When calling runNetwork()
it keeps "pumping" messages between participants until no more messages are generated.
The problem comes in when a flow suspends on an async operation: the mock network
thinks the flow finished the work for the current step, and since no more messages
are generated, completes the runNetwork() function. The message that the flow
generates once it resumes after async operation completion never gets processed.
This change makes runNetwork() wait until all flow async operations finish,
and only then check whether no more messages can be transferred.
2018-11-01 19:03:43 +00:00
56158caa8b Fix merge 2018-11-01 17:59:39 +00:00
6c58a28038 Fix merge 2018-11-01 17:04:52 +00:00
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
4e0a956e20 CORDA-2083 Deserialize component groups lazily (#4122)
CORDA-2083 Deserialize component groups lazily
2018-11-01 16:54:31 +00:00
b0771d6f2b Fixing a single typo (#4152)
changing "areshared" to "are shared"
2018-11-01 16:53:47 +00:00
b444701d7e Formatting issue (#4150) 2018-11-01 16:47:50 +00:00
722fa31fb6 Documents waitForLedgerCommit. Clean-up. (#4144) 2018-11-01 15:23:47 +00:00
f2b36ea10f Fix mailing list link to point to corda-dev 2018-11-01 16:04:12 +01:00
7ca1dd5848 Fix issue where verbosity wasn't working on subcommands (#4147) 2018-11-01 11:34:14 +00:00
5d1362bca6 [ENT-2624] Disable switch for SNI functionality (#1487)
* [ENT-2624] Disable switch for SNI functionality

* * Add SNI switch to driver
* Make BridgeRestartTest test for both enableSNI = true and false
2018-11-01 11:15:24 +00:00
eaea6546fe Merge pull request #1524 from corda/merges/os-mere-2018-10-31
OS -> ENT merge, resolved conflicts: README.md,  docs/source/api-persistence.rst, docs/source/node-database.rst.
2018-11-01 10:31:59 +00:00
777026eb79 Undo test deletion which got lost in commit 391c6bf66f. (#4145) 2018-11-01 10:29:59 +00:00
fcea655bf1 Align with ENT repo - explicit node names in the FlowOverrideTests integration test. (#4146) 2018-11-01 09:59:47 +00:00
b883ef6321 Merge pull request #1525 from corda/ENT-2678
[ENT-2678] Disable PluginRegistrationTest until we fix it.
2018-11-01 09:57:02 +00:00
449463241b Disable PluginRegistrationTest until we fix it. 2018-11-01 09:52:03 +00:00
88782f7544 Merge pull request #4143 from corda/james-corda-network-1
James corda network 1
2018-10-31 21:17:53 +00:00
2cdcbc8ead Updated with governance-guidelines and minor edits to other governance documents. 2018-10-31 19:58:21 +00:00
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
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
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
8ddd8d383d Remove unused test class (#4139) 2018-10-31 12:58:57 +00:00
f159629e36 Update README.md 2018-10-31 11:12:31 +00:00
fa87054b82 Update README.md 2018-10-31 11:09:02 +00:00
62399d04c7 Removed personal tone ('we'/'R3') from docs, in keeping with rest of documentation. 2018-10-31 09:17:21 +00:00
abf47a7c01 Merge pull request #4141 from corda/gendal-patch-1
CORDA-2170 Add Apache 2 license badge
2018-10-31 08:53:35 +00:00
3d5994c375 Revert "Add files via upload"
This reverts commit 82d9f9846f.
2018-10-30 23:02:10 +00:00
3a20e3f208 Updated with governance-guidelines and minor edits to other governance documents. 2018-10-30 19:27:40 +00:00
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
a1da0b4a63 Add Apache 2 license badge 2018-10-30 17:53:54 +00:00
ab1deaac99 CORDA-1953 Display error when unable to open connection to Docker (#4136)
* Display error when unable to open connection to Docker

* review comments
2018-10-30 17:14:47 +00:00
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
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
f51a23ef14 Merge pull request #1513 from corda/merges/os-merge-2018-10-30
OS -> ENT merge on 2018-10-30
2018-10-30 15:48:03 +00:00
e064800173 CORDA-2112 Update the uploader field for Attachments loaded upon Node CorDapp startup (#4127)
* CORDA-2112 Update the `uploader` field upon Node startup for CorDapps where an Attachment is already in a nodes attachment store (from an untrusted source).

* Removed incorrect assertion.

* Fix broken unit test.

* Reverted back throw FileAlreadyExistsException API semantics on public API.

* De-duplicate DuplicateAttachmentException

* Revert original Exception handling logic.
2018-10-30 15:44:29 +00:00
13815d252e ENT-2659 Eliminate lots of contention in serialization (#4120)
* Remove most contentious bit of mutex in the codebase
Fix up SerializerFactory
Make getSerializerFactory() non-blocking
Workaround for DJVM issues

* Some clean up and also de-contend the RPC client.

* Fix up attachment class loader code.

* Bug fix
2018-10-30 15:26:46 +00:00
4bfdcd5ae1 add explicit warnings about openJDK being unsupported 2018-10-30 15:03:01 +00:00
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
30fedec343 CORDA-1838: A few misc fixes (#4126)
* Remove unused code

* Make comment readable

* Remove joptsimple from node/shell

* tabs vs whitespace
2018-10-30 14:01:20 +00:00
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
38078e3762 Update CONTRIBUTORS.md 2018-10-30 09:46:38 +00:00
210aded751 Added SQL setup for integretion test run in database mode. (#1511)
Ensure unique node names.
2018-10-30 09:36:55 +00:00