13751 Commits

Author SHA1 Message Date
Anthony Keenan
7ca1dd5848
Fix issue where verbosity wasn't working on subcommands (#4147) 2018-11-01 11:34:14 +00:00
Patrick Kuo
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
szymonsztuka
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
szymonsztuka
777026eb79
Undo test deletion which got lost in commit 391c6bf66fc31f2609f787298ef1ce77ffe7fb73. (#4145) 2018-11-01 10:29:59 +00:00
szymonsztuka
fcea655bf1
Align with ENT repo - explicit node names in the FlowOverrideTests integration test. (#4146) 2018-11-01 09:59:47 +00:00
Michele Sollecito
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
Florian Friemel
449463241b
Disable PluginRegistrationTest until we fix it. 2018-11-01 09:52:03 +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
Anthony Keenan
8ddd8d383d
Remove unused test class (#4139) 2018-10-31 12:58:57 +00:00
Joel Dudley
f159629e36
Update README.md 2018-10-31 11:12:31 +00:00
Joel Dudley
fa87054b82
Update README.md 2018-10-31 11:09:02 +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
Richard Gendal Brown
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
jamescarlyle
3d5994c375 Revert "Add files via upload"
This reverts commit 82d9f9846faf5a943499a17d9941cd37eb784008.
2018-10-30 23:02:10 +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
Richard Gendal Brown
a1da0b4a63
Add Apache 2 license badge 2018-10-30 17:53:54 +00:00
Stefano Franz
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
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
szymonsztuka
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
josecoll
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
Rick Parker
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
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
Anthony Keenan
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
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
Joel Dudley
38078e3762
Update CONTRIBUTORS.md 2018-10-30 09:46:38 +00:00
szymonsztuka
210aded751
Added SQL setup for integretion test run in database mode. (#1511)
Ensure unique node names.
2018-10-30 09:36:55 +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
Tommy Lillehagen
199a20398c
CORDA-1633 - Check Java version before launch (#4128) 2018-10-29 16:52:57 +00:00
Michele Sollecito
412cc4622e
Merge pull request #1512 from corda/merges_29_10_16_23
Merges: 29/10/2018 at 16:23
2018-10-29 16:36:44 +00:00
Chris Rankin
ff9061b968
ENT-1906: Don't transform java.Object[] to sandbox.Object[]. (#4115)
* Don't transform java.Object[] to sandbox.Object[] because an array is still java.Object inside the sandbox.
* Add extra test for sandboxing an array of int[].
* Ensure hashCode() is deterministic for Java arrays.
* Remove some information about DJVM from some exception stack traces.
2018-10-29 16:32:40 +00:00
Michele Sollecito
8dd4fe6803 Merge remote-tracking branch 'remotes/open/master' into merges_29_10_16_23 2018-10-29 16:24:03 +00:00
Michele Sollecito
34cadc4264
Fixed broken default logging level. (#4129) 2018-10-29 16:21:35 +00:00
Michele Sollecito
3139f430d8
Merge pull request #1510 from corda/merges/29_10_2018_13_40 2018-10-29 15:18:31 +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
Tommy Lillehagen
5086358834
NOTICK - Enable generation of test tickets for snapshots (#4123)
* NOTICK - Enable generation of test tickets for snapshots
* NOTICK - Update documentation and CLI help
2018-10-29 13:18:50 +00:00
Dan Newton
671a9d232c Add tests for CordaRPCOps.uploadAttachmentWithMetadata (#4125)
There were no tests around `CordaRPCOps.uploadAttachmentWithMetadata`
therefore tests have been added to verify that the function works
and saves the correct metadata to the vault
2018-10-29 11:04:06 +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
5ac6e1030e Re-reverting the right revert 2018-10-28 17:20:42 +00:00
Anthony Keenan
92184b47f6 Remove superfluous call 2018-10-28 14:54:24 +00:00
Anthony Keenan
a589f5e984 Revert merge conflicts 2018-10-28 14:05:49 +00:00
Anthony Keenan
3c669396b3 Fix another compilation error 2018-10-27 01:28:18 +01:00