szymonsztuka
cb43091ff8
Merge Open Source into Enterprise
...
# Resolved conflicts:
# core/src/main/kotlin/net/corda/core/node/services/TransactionStorage.kt
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/CordappScanningDriverTest.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/test/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/Corda.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/StartedNode.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/trader-demo/src/integration-test/kotlin/net/corda/traderdemo/TraderDemoTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2017-12-05 17:35:54 +00:00
Joel Dudley
9adf4bfc57
Removes the maxWidth parameter that caused the docsite to not use the full screen width.
2017-12-05 14:23:41 +00:00
Andras Slemmer
63027a077d
State machine rewrite
2017-12-05 11:36:20 +00:00
Joel Dudley
426b5eb44a
Adds an example use of pagination.
2017-12-05 10:25:48 +00:00
Katelyn Baker
ae3a3444f2
Merge pull request #2154 from corda/kat/feature/enumEvolution2
...
Kat/feature/enum evolution2
2017-12-04 17:07:01 +00:00
Ben Abineri
ca06132c49
add upstart instructions ( #2171 )
...
* add upstart instructions
* Fixes formatting.
* slightly clearer wording
2017-12-04 14:32:47 +00:00
Shams Asari
5264072752
Renamed n.c.nodeapi.config to n.c.nodeapi.internal.config as that config code is not public API. For the same reason, also moved User into the same internal package.
2017-12-03 17:20:30 +00:00
szymonsztuka
709b3791a3
SQL Azure and SQL Server database integration tests ( #115 )
...
* Integration test are parameterised (extends IntegrationTest) to run against a remote database with 4 db scripts run @BeforeClass, @Before, @After and @AfterClass.
* SQL script for SQL Azure and SQL Server databases and templates of JDBC configuration.
2017-12-01 17:17:51 +00:00
Katelyn Baker
32ebd2cc8b
CORDA-553 - Review comments
2017-12-01 16:59:19 +00:00
Ben Abineri
9a9eb72179
Merge pull request #2153 from corda/bena-docs-enable-service
...
Docs update: instructions to enable service
2017-12-01 14:10:32 +00:00
szymonsztuka
2bdd8b681d
Merge OS to Enterprise.
...
Main differences preserved in Enterprise version:
* constants.properties: platform version 1 (OS has 2)
* gradle-wrapper.properties: higher Gradle version gradle-4.3.1 (OS has gradle-4.3)
* Driver.kt - setting system property "user.dir"
2017-11-30 23:54:12 +00:00
Andrzej Cichocki
a314a6a125
CORDA-654 Simplify TransactionDSL API ( #2152 )
2017-11-30 16:28:44 +00:00
Tudor Malene
5a6f2a19b3
[CORDA-824]: fix resource leak in Cash selection ( #2155 )
...
[CORDA-824]: fix resource leak in Cash selection and some example class
2017-11-30 16:17:18 +00:00
Katelyn Baker
541207738a
CORDA-553 - Documentation
2017-11-30 13:31:33 +00:00
joeldudleyr3
1e58aedb80
Fixes order of xmx commands.
2017-11-30 11:13:16 +00:00
joeldudleyr3
ada1fe2438
Documents increasing heap size when running nodes locally.
2017-11-30 10:38:06 +00:00
Ben Abineri
a88e7c9035
enable service instructions
2017-11-30 10:06:37 +00:00
Joel Dudley
2525fb52be
New docs on deploying a node. Makes it clear existing docs were only for local or dev deployments.
2017-11-29 17:07:13 +00:00
mkit
c40e8e4518
Overriding network parameters if they are specified in the deployment… ( #136 )
...
* Overriding network parameters if they are specified in the deployment configuration
* Addressing review comments
* Addressing review comments
* Changing the getCurrentNetworkMap return type to be nullable
2017-11-29 16:46:36 +00:00
szymonsztuka
5e901d4950
[ENT-1153] fix merge - database description was duplicated, adhere to OS version
2017-11-29 11:37:48 +00:00
Michele Sollecito
cb1fa2e017
Corda now works with H2 without the need to allow Hibernate to create the database automatically. ( #2124 )
...
[CORDA-815]: Corda now instructs Hibernate to either adjust or validate the schema based on `devMode` property.
Also renamed property `database.initDatabase` to `database.createSchemaAutomatically`.
* [CORDA-815]: Renamed database.initDatabase to database.adjustSchemas.
* Code review changes: removed property `database.initDatabase` altogether.
* Code review changes: removed property `database.initDatabase` altogether.
* Code review changes: removed property `database.initDatabase` altogether.
* Code review changes: removed property `database.initDatabase` altogether.
2017-11-28 17:33:02 +00:00
Andrzej Cichocki
4bd6fef0f9
StateMachineManager is no longer lateinit. ( #2123 )
2017-11-27 17:55:08 +00:00
Tudor Malene
e8d833c2fe
Merge remote-tracking branch 'open/master' into features/ENT-1153/merge_OS2ENT
...
# Conflicts:
# .idea/compiler.xml
# docs/source/changelog.rst
# node/src/test/kotlin/net/corda/node/services/transactions/DistributedImmutableMapTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2017-11-27 16:52:29 +00:00
Shams Asari
1705df4d1f
Made the database config option typesafe, rather than relying on String properties
2017-11-27 13:51:53 +00:00
Joel Dudley
c4b333c50c
Updates permissioning docs to address RGB review comments.
2017-11-27 13:36:52 +00:00
Patrick Kuo
20337aaa25
Network permissioning new doc
2017-11-24 18:06:01 +00:00
David Lee
71681e0e0a
Merge pull request #106 from corda/dl-float-design-doc
...
Current design doc baselined - please raise future updates via a separate PR
2017-11-24 14:02:05 +00:00
josecoll
1befa35055
Design Review Process ( #94 )
...
Design Review Process V1.0
2017-11-24 13:39:13 +00:00
Alberto Arri
ffd693719a
docs for additional-node-infos ( #2107 )
...
* docs for additional-node-infos
2017-11-24 13:27:30 +00:00
mkit
c5e17d90f2
Adding HSM signing service docs ( #122 )
...
* Adding HSM signing service docs
* Addressing review comments
* Addressing review comments - round 2
* Addressing review comments - round 3
* Fixing method comment
2017-11-24 11:32:12 +00:00
Maksymilian Pawlak
ce9b6c1f18
CORDA-311-post PR merged fixes ( #2106 )
...
* SSH server integration
2017-11-23 16:34:57 +00:00
Joel Dudley
5c18c57417
Fixes an error in the contract testing tutorial.
2017-11-23 11:27:34 +00:00
Ross Nicoll
22d29db54b
Add X500 name constraints for non-organisation attributes ( #2108 )
...
Enforce X500 name constraints consistently across all attributes
2017-11-22 18:00:43 +00:00
Joel Dudley
7bde9ecefd
Adds upgrade notes for v1 to v2. Minor tweaks (e.g. ToC).
2017-11-22 17:33:40 +00:00
Ross Nicoll
f314bf4849
Re-introduce demo docs ( #1981 )
...
Document the included samples in the docs again so there's some continuity from v1 docs, while making it clear they're not best practice examples but instead illustrate solutions to various use-cases.
2017-11-22 15:39:48 +00:00
szymonsztuka
175bceb5e8
SQL Azure database compatibility ( #113 )
...
* Coin selection for SQL Server/Azure
* Transaction isolation level change for updateInfoDB in PersistentNetworkMapCache from "repeatableRead" to "readCommitted"
* Configuration option to prefix all Hibernate generated SQL with a schema name via a configuration property `database.schema`
* Fix negative value in SELECT TOP query (fix for Oracle db)
2017-11-22 12:28:38 +00:00
Joel Dudley
43a8d21977
Removes outdated devmode cert info, links to existing docs to avoid duplication.
2017-11-22 12:07:53 +00:00
szymonsztuka
0f8baae962
Merge opensource into master
2017-11-21 18:53:14 +00:00
Katelyn Baker
426a47ce36
Merge pull request #2073 from corda/releaseNotesMergeFromV2
...
RELEASE: Merge release notes for V2 back into master
2017-11-21 11:24:17 +00:00
Maksymilian Pawlak
e63b6d1386
CORDA-311 Shell via SSH server ( #2087 )
...
* SSH server integration
2017-11-20 17:41:38 +00:00
Ross Nicoll
d3c7f90995
RELEASE: docs dropdown update ( #2092 )
2017-11-20 16:06:49 +00:00
Katelyn Baker
943fbd220b
RELEASE: Merge release notes for V2 back into master
2017-11-20 11:56:01 +00:00
Andrzej Cichocki
f26aa33553
Introduce contextLogger ( #2085 )
...
* Revert with comment, probably lazy for a reason.
2017-11-20 11:31:08 +00:00
josecoll
ea1cd0035a
Merge remote-tracking branch 'open/master' into colljos-merge-171117
2017-11-18 11:03:36 +00:00
Ross Nicoll
8e7165db41
CORDA-759: Enforce key checks on identity de-anonymisation ( #1993 )
...
Previously when de-anonymising a Party instance, the name of the Party was used rather than
the key, meaning a Party could be constructed with a random nonsense key and any name, and be treated as corresponding to the well known identity. This is not a security hole in itself as
in any real scenario a party shouldn't be trusted without having been registered, it creates
a significant risk of a security hole depending on how trusted the anonymous identity is, and
the returned identity is considered.
2017-11-17 18:13:35 +00:00
David Lee
d9dd6c9693
Updated
2017-11-17 15:18:36 +00:00
David Lee
218a432f89
Updated
2017-11-17 15:17:55 +00:00
josecoll
7a9364c8d5
Merge remote-tracking branch 'open/master' into colljos-merge-171117
...
# Conflicts:
# .idea/compiler.xml
# build.gradle
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/CordaRPCClientTest.kt
# docs/source/changelog.rst
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/main/kotlin/net/corda/node/internal/StartedNode.kt
# node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt
# samples/network-visualiser/build.gradle
# 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/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
2017-11-17 15:11:24 +00:00
David Lee
9497f34698
Added meeting minutes
2017-11-17 14:10:21 +00:00
Joel Dudley
85071f227a
Reflects tutorial changes and CorDapp build docs changes from release-V1.
2017-11-16 15:31:52 +00:00
