4984e92e31
Merge branch 'os-merge-point' into os-merge-shams
...
# Conflicts:
# build.gradle
# core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt
# core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
# docs/source/api-persistence.rst
# node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/BridgeControlListener.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
# settings.gradle
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/internal/MockCordappProvider.kt
2018-11-14 18:13:01 +00:00
f3b09988a9
Updates tutorial to reflect new template structure. Clean-up. ( #4216 )
...
* Initial improvements.
* Updates tutorials.
* Missing imports.
* Addresses review feedback.
2018-11-13 11:50:24 +00:00
237c133804
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180814-1
...
# Conflicts:
# CONTRIBUTORS.md
# constants.properties
# docs/source/index.rst
# docs/source/upgrading-cordapps.rst
# node/build.gradle
2018-08-14 11:26:52 +01:00
9bbc85db61
Miscellaneous doc fixes ( #3760 )
...
* ENT-2298: CE Hello World Tutorial Page references Corda V1.0
Removed version number completely from text, I thought this made more sense than hardcoding a version which will almost immediately be out of date.
* ENT-2302: Hello World Tutorial Page mismatch between code sample and explanatory text
Updated text to proper method
* ENT-2305: Java Instructions to Invoke Hello World CordApp fail
Removed Java instructions
2018-08-10 12:28:59 +01:00
a63c9526ca
Merge OS
2018-08-01 14:13:39 +01:00
d42b9f51ac
Miner change to mention notary node dosen't need web server, and also change the total terminal windows number from 8 to 5 ( #3012 )
...
* There is a duplication of the kotlin introduce part, which is the same as the description of the "Note" section right below. So remove this duplicated part but keep the "Note".
* A miner change about the build node folder structure, first is Notary node doesn't need one web server, second is in V3.0, there are 5 windows totally but not 8.
* Miner updates for the format of changes, as instructed by Joel on https://github.com/corda/corda/pull/3012
2018-07-31 15:36:25 +01:00
8b3a5432cb
Merge commit '02348a584d56cdb562581d99be5b56348f7d1001' into chrisr3-os-merge
2018-06-23 00:06:11 +01:00
3125ec9f73
[ENT-1955] Documentation fixes ( #3417 )
2018-06-21 16:57:30 +01:00
ce7ba2182b
Merge remote-tracking branch 'open/master' into mike-merge-ea81548d6
2018-05-11 16:41:39 +02:00
54e1a7aa7e
Docs: fix some broken markup that caused rendering errors and warnings.
2018-05-11 13:02:40 +02:00
855f89b61e
Merge remote-tracking branch 'open/master' into andrius/os-merge
2018-05-03 13:37:39 +01:00
beef7bdfba
A typo fix.
...
Line 108
Was: We want to create an IOU of 100 with PartyB. We start the ``IOUFlow`` by typing:
Should be We want to create an IOU of 99 with PartyB. We start the ``IOUFlow`` by typing:
2018-04-30 13:54:14 +01:00
a59083ceb2
Merge remote-tracking branch 'open/master' into os-merge-020318
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
2018-03-02 10:42:03 +00:00
8616f24523
CORDA-1048: Making it simpler to move an existing local deployment of nodes to across different machines. ( #2672 )
...
This was achieved by having the hash in the node-info file to be just of the node's X.500 name. This also solves existing duplicate node-info file issues that we've been having.
Also updated the docsite.
2018-03-01 21:24:10 +00:00
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
471907366b
Renames Controller to NetworkMapAndNotary, in line with templates and example CorDapp.
2018-01-25 15:14:32 +00:00
729aa65e7f
Merge from R3 Corda 3.0 Dev Preview release branch to master
2018-01-13 11:00:01 +00:00
c1874cbd62
Fixes a broken link to the shell page.
2018-01-03 10:00:33 +00:00
e1e715ee81
Removed all remaining special treatment of the X500 common name.
...
With network parameters the CN is no longer needed to identify notaries. This frees it up to be used in the node's name alongside the other attributes.
Also, the identity generation logic has been simplified, removing the need to have magic string values for storing distributed identities in the keystore. Now there are just two alias prefixes: "identity" as it was previously, and "distributed-notary".
2017-12-18 21:39:11 +00:00
929341e7ee
Updates tutorials (general fixes, link to solutions repos)
...
* Updates tutorial to make imports to be added clearer, and to reflect new repo structure.
* Adds links to the solution repos for tut 1.
* Further fixes based on dry-run.
2017-12-13 16:22:40 +00:00
e63b6d1386
CORDA-311 Shell via SSH server ( #2087 )
...
* SSH server integration
2017-11-20 17:41:38 +00:00
85071f227a
Reflects tutorial changes and CorDapp build docs changes from release-V1.
2017-11-16 15:31:52 +00:00
d3e8df1644
Separates out the tutorial code into separate docs to ensure it compiles.
2017-10-16 14:39:28 +01:00
2680361696
Renamed "plugins" dir to "cordapps" ( #1644 )
...
* Renamed plugins dir to cordapps dir while maintaining backwards compatibility with the plugins dir.
Bumped gradle plugins to 2.0.4
2017-10-13 15:01:24 +01:00
3bee830604
[CORDA-442] Removed the NetworkMap option from Cordform, changed all the examples… ( #1827 )
...
[CORDA-442]
Removed the option for Cordformation to specify a networkMap.
All the samples have been migrated to not specify a networkMap.
2017-10-10 15:45:42 +01:00
bd53a22efa
Removed extraAdvertisedServiceIds config
...
The remaining use for it was the finance CorDapp for permissioning CCY issuers. Instead this is now taken from a custom config in node.conf.
2017-10-10 13:47:37 +01:00
0c2289de8c
Joel move api docs
2017-10-09 11:32:03 +01:00
727cd0e55c
Cleaned up notary configuration by introducing a notary config option.
...
extraAdvertisedServiceIds is no longer used for this.
2017-10-07 12:52:37 +01:00
2a1a9c9d20
Updates hello world tutorials for v1.0.
2017-10-02 09:08:59 +01:00
4641d3c4dd
Moves code sections in tutorials to code files.
2017-10-01 23:33:15 +01:00
57412d4498
Enforce X500Name format defined in design doc ( #1427 )
...
* Standardise X500Name format - WIP
* address PR issues
* failing test fix and replace X500Name with getX500Name
* gradle plugin fix
* Added country code validation
2017-09-07 14:47:42 +01:00
2829faa01f
Retire legalContractReference ( #1188 )
...
* Add LegalProseReference annotation
* Migrate code from autogenerated javascript to TypeScript source
* Add instructions to rebuild the web resources
* Make installWeb more reproducible
2017-08-18 13:30:39 +01:00
4eb58b874a
Additional fixes to the tutorial.
2017-08-17 12:02:44 +01:00
435dcf6af4
Fixes the hello, world tutorial.
2017-08-16 08:36:00 +01:00
499f1920c7
Simplifies the Hello, World tutorial.
2017-07-07 12:06:28 +01:00
19ff72a411
Correct ISO country code in names
2017-06-21 14:04:22 +01:00
73fbcea0e3
Hello, World! CorDapp tutorial
2017-06-16 14:05:52 +01:00
