Commit Graph

729 Commits

Author SHA1 Message Date
Matthew Nesbit
9ba02b170b Read the balances off of the vault update. 2016-11-29 17:37:26 +00:00
Andrius Dagys
8f2d026965 M6 release notes 2016-11-29 17:27:25 +00:00
Richard Green
d8b5a8298c removed redundant text 2016-11-29 17:20:36 +00:00
Richard Green
010326721c removed redundant text 2016-11-29 17:15:23 +00:00
Richard Green
a1920ddddd removed erroneous space 2016-11-29 16:52:49 +00:00
Richard Green
34ea7f09af Starting new pull request - previous one had conflict errors 2016-11-29 16:52:07 +00:00
Richard Green
c9d6c4d8ee Adding a CLI / IDE page 2016-11-29 16:23:47 +00:00
Mike Hearn
d87e027bd6 Merged in mike-warn-about-ij-bug (pull request #584)
Docs: warn about IntelliJ issue that causes .idea to be wiped at import time
2016-11-29 16:08:17 +00:00
Andrius Dagys
d92ccb0f80 Added a placeholder for M6 release notes 2016-11-29 16:06:07 +00:00
Mike Hearn
e4ee1b51e6 Docs: warn about IntelliJ issue that causes .idea to be wiped at import time 2016-11-29 15:53:35 +00:00
Andrius Dagys
296d93fbd9 Merged in andrius-change-copyright (pull request #570) 2016-11-29 15:35:18 +00:00
Matthew Nesbit
df6fc69cc6 Merged in mnesbit-building-transactions (pull request #571)
Created some examples to include in tutorial on building transactions.
2016-11-29 15:15:32 +00:00
Rick Parker
55b10644dd Merged in parkri-oracle-docs (pull request #559)
Update and add oracles documentation
2016-11-29 15:12:09 +00:00
rick.parker
c3e8a9eb19 Doc updates for oracles 2016-11-29 15:09:38 +00:00
Clinton Alexander
dea7b39734 Merged in colljos-docs-rpctutorial (pull request #581)
RPC Tutorial: re-instated gradle main class name.
2016-11-29 15:02:37 +00:00
Matthew Nesbit
4a504ca3dc Created some examples to include in tutorial on building transactions.
Complete the transaction building doc with code fragments.

Fix gradle build

Handle PR comments

Put back in missing main class line

Couple of minor improvements from PR
2016-11-29 14:50:20 +00:00
Andrius Dagys
b73116ff1b Merged in docsite-theme-fix (pull request #578) 2016-11-29 14:48:33 +00:00
Andrius Dagys
4012d4b136 Docs: added an explanation on how to specify a custom service name. Added a ref for composite keys section. 2016-11-29 14:46:05 +00:00
Jose Coll
ee2a60f345 RPC Tutorial: re-instated gradle main class name. 2016-11-29 14:30:22 +00:00
Roger Willis
b3e5bede39 Merged in rog-cordapp-tutorial (pull request #490)
First pass on Corda SDK tutorial
2016-11-29 13:47:08 +00:00
RogerWillis
9c9691ae77 Addressed review points. Added a stub file in the getting started section that indicates devs should look at the cordapp tutorial. 2016-11-29 13:45:58 +00:00
Jose Coll
690336b2e0 Incorp feedback from PR review. 2016-11-29 12:38:47 +00:00
Jose Coll
4aae92046d Removed Key Concept docs. 2016-11-29 12:38:47 +00:00
Jose Coll
d8c485aca9 Fixed formatting problems. 2016-11-29 12:38:47 +00:00
Jose Coll
066aacad85 Updated RPC Tutorial docs and gradle file. 2016-11-29 12:38:47 +00:00
Jose Coll
f3f016720d First draft 2016-11-29 12:38:01 +00:00
Jose Coll
4d80d5fc2e Removed Key Concept docs. 2016-11-29 12:38:01 +00:00
Jose Coll
92102e0157 Fixed formatting problems. 2016-11-29 12:38:01 +00:00
Jose Coll
909b4dccad Updated RPC Tutorial docs and gradle file. 2016-11-29 12:37:40 +00:00
Jose Coll
07aeec9f6f First draft 2016-11-29 12:35:41 +00:00
Andrius Dagys
f3e6b7b528 Format docsite css 2016-11-29 12:01:48 +00:00
Andrius Dagys
869324bfd1 Fixed docsite theme mobile view. Minor tweak to the headers 2016-11-29 12:00:11 +00:00
Katarzyna Streich
e10b199ae1 Add clauses documentation. 2016-11-29 11:53:54 +00:00
Andras Slemmer
ba84ce7358 Merged in aslemmer-integtest-docs (pull request #553)
docs: Add integration test tutorial
2016-11-29 11:47:27 +00:00
Mike Hearn
8aafeabd01 Regen docsite 2016-11-29 11:38:52 +00:00
Mike Hearn
3325985a49 Docsite: minor fixes 2016-11-29 11:37:13 +00:00
Mike Hearn
ac93eb3cd6 Revert "docs: Use find to get all src directories for dokka"
This reverts commit 3a10d504d3.
2016-11-29 11:37:12 +00:00
Mike Hearn
64e241896e Tech white paper: improve Merkle tree diagrams and rerender 2016-11-29 10:05:32 +00:00
Andrius Dagys
9aca65bdce Merged in andrius-doc-tweak (pull request #572) 2016-11-29 09:34:42 +00:00
Andrius Dagys
13e781ea73 Minor: fix spacing in using-a-notary docs 2016-11-28 18:22:13 +00:00
Rick Parker
a666bbcc06 Merged in parkri-visualiser-docs (pull request #564)
Simulator docs update
2016-11-28 18:20:36 +00:00
rick.parker
2737e9a9e4 Simulator docs update 2016-11-28 18:19:57 +00:00
Andrius Dagys
eec079ed62 Minor tweaks to the configuration docs: make the use of : and = consistent, rename titles 2016-11-28 18:04:06 +00:00
Andras Slemmer
53a825e4cc docs: Address PR 553 comments 2016-11-28 17:08:45 +00:00
Mike Hearn
570470f255 Tech white paper: change abstract a little bit. Some reviewers found that they still needed to read the intro white paper to understand all the material in this one. 2016-11-28 16:20:46 +00:00
Andrius Dagys
90e7aaec8b Update doc copyright notice to 'Copyright 2016, R3 Limited' 2016-11-28 16:17:55 +00:00
RogerWillis
435e7da93f Changed SDK tutorial based on latest repo changes and some feedback.
Addressed some review comments.

Latest changes to SDK tutorial based on review comments.

Corda SDK -> CorDapp Template

Addressed review comments + added some new sections.

Added pic of run config drop down menu.

Added a couple of additional sections.

Refactored the 'how to make a cordapp' how to a separate docs pages and stubbed it out for comments.

Added index.rst

Additional changes based on feedback.

Addressed review comments. Removed spurious buuildinfo file.

Minor changes based on richard's comments. Still waiting on resolution of dev experience preference.

Changed milestone release workflow. Users now should checkout a specific tag.
2016-11-28 15:42:48 +00:00
Andrius Dagys
2f37024af7 Added tutorials on how to use & run a notary. 2016-11-28 15:15:13 +00:00
Mike Hearn
3d77ed2575 Tech whitepaper: take out confidentiality notice and re-render 2016-11-28 14:27:23 +00:00
Mike Hearn
a693330cbb Rerender tech whitepaper PDF 2016-11-28 14:23:39 +00:00
Mike Hearn
f840f8b58c Merge branch 'tech-whitepaper' 2016-11-28 14:23:00 +00:00
Mike Hearn
6c8996fb5e Tech white paper: update example from Sofus 2016-11-28 14:22:11 +00:00
RogerWillis
ce64dbeba7 Added some additional sections and fixed some typos 2016-11-28 14:19:43 +00:00
RogerWillis
d243ef298a Beginnings of CorDapp SDK tutorial 2016-11-28 14:19:43 +00:00
Andras Slemmer
2c96bbf95c Merged in aslemmer-dokka-all-sources (pull request #566)
docs: Use find to get all src directories for dokka
2016-11-28 14:19:23 +00:00
Mike Hearn
536b79a5f2 Tech white paper: replace - with -- 2016-11-28 14:14:17 +00:00
Mike Hearn
53b90147d9 Tech white paper: address review comments 2016-11-28 14:14:16 +00:00
Mike Hearn
a268e05dbb Tech white paper: add diagrams, a few more minor edits in response to feedback from Tim Swanson, Mark Oldfield and Richard Brown. 2016-11-28 14:14:15 +00:00
Mike Hearn
79537898df Merged in sofus-tech-whitepaper (pull request #567)
updated fx call option example
2016-11-28 14:13:45 +00:00
Sofus Mortensen
cd1fa99b43 updated fx call option example 2016-11-28 15:11:33 +01:00
Shams Asari
2f769b3db0 Cleaning up doc headers to be consistent wrt casing 2016-11-28 14:08:16 +00:00
Andras Slemmer
d9023fd889 docs: Line wrap integ test tutorial 2016-11-28 13:37:38 +00:00
Andras Slemmer
3a10d504d3 docs: Use find to get all src directories for dokka 2016-11-28 13:28:43 +00:00
Andras Slemmer
c6a994aca2 docs: Add setting-up-a-corda-network to index.html 2016-11-28 11:58:14 +00:00
Andras Slemmer
2bb1ecdfc1 docs: Add note on self-issuance example in integtest tutorial 2016-11-28 11:52:12 +00:00
Andras Slemmer
220ccdbe13 docs: Add integration test tutorial 2016-11-28 11:52:12 +00:00
Patrick Kuo
2d46249d87 Merged in pat-permissioning-doc (pull request #545)
doc : Network Permissioning
2016-11-28 09:40:38 +00:00
Andrius Dagys
946cfda03e Added a distributed notary demo that runs a notary cluster and gets several transactions notarised 2016-11-25 17:09:57 +00:00
Clinton Alexander
5af5cc100a Updated documentation to reflect current gradle plugins build cycle. 2016-11-25 16:56:09 +00:00
Patrick Kuo
55ea753c52 Added dev mode to the example config 2016-11-25 16:35:43 +00:00
Patrick Kuo
be81e9b620 permissioning doc 2016-11-25 16:33:00 +00:00
Andras Slemmer
44d1b79ef9 docs: Address PR 513 comments 2016-11-25 15:33:04 +00:00
Andras Slemmer
720bb55827 docs: setting-up-a-corda-network 2016-11-25 15:32:33 +00:00
Mike Hearn
d2e8f8e0a9 Regen docsite 2016-11-25 13:10:21 +01:00
Mike Hearn
8d773d951b Docs: fix broken image links 2016-11-25 13:08:57 +01:00
Rick Parker
699710b736 Merged in parkri-remove-quasar-scan (pull request #540)
quasarScan removal.  It's no longer required by our code base.
2016-11-24 16:28:44 +00:00
rick.parker
8ec21eedb3 quasarScan removal. 2016-11-24 16:27:51 +00:00
rick.parker
492005bcfe Fix up and improve some docs 2016-11-24 15:06:10 +00:00
rick.parker
d68cc0467c Fix bad merge on index.rst 2016-11-24 08:21:21 +00:00
Ross Nicoll
54620200f5 Discuss contract design in the contract writing tutorial
Signed-off-by: Ross Nicoll <ross.nicoll@r3cev.com>
2016-11-23 17:50:15 +00:00
Matthew Nesbit
6ecdf5a946 Document on plugin loading framework and a tiny tweak on logging.
Word wrap document.

Change protocol to flow.

Try to improve plugin discussion based on PR comments.

add comma
2016-11-23 17:20:56 +00:00
Richard Green
420b992b1b Merged in rg_adding_analytics_to_docs (pull request #535)
Adding analytics to docs part of website
2016-11-23 16:39:40 +00:00
Richard Green
2673ebdfcf Adding analytics to foote
Now has two layouts - one for normal access, the other for usage on public docsite
2016-11-23 14:44:19 +00:00
Patrick Kuo
c6cec0aa3d address PR comments 2016-11-23 13:36:55 +00:00
Patrick Kuo
80ce506b8a Readme.md, description for new screens, and updated screenshots 2016-11-23 13:36:38 +00:00
Mike Hearn
784946983f Regen docsite 2016-11-23 13:50:02 +01:00
Mike Hearn
3bec44cd65 Misc doc markup and TODO fixes. 2016-11-23 13:25:44 +01:00
Mike Hearn
1cc688561d Minor: fix running-the-demos port numbers. 2016-11-23 13:07:49 +01:00
Richard Green
7a9ec487f3 Adding analytics to docs part of website 2016-11-23 11:46:13 +00:00
Matthew Nesbit
345d62542d Rather brief description of every service implemented in the node project.
Take on fixes from PR.

Change protocol to flow.

Update for Shams's comments

Fix typos
2016-11-23 09:17:30 +00:00
rick.parker
6c3476e89f Rename protocol to flow in docs 2016-11-23 08:29:14 +00:00
rick.parker
f68529d1fd Rename protocol to flow. 2016-11-22 17:17:14 +00:00
Shams Asari
d8e09f7174 Minor cleanup of attachment demo 2016-11-22 17:06:18 +00:00
Mike Hearn
ccd1c39492 Docs: re-render the tech white paper 2016-11-22 16:12:17 +01:00
Mike Hearn
401c78c97f Tech white paper: address more review comments 2016-11-22 16:11:45 +01:00
Jose Coll
5ab6644671 Small suggested additions in mainline text. 2016-11-22 16:11:44 +01:00
Jose Coll
29cffe2ce4 Fixed typos and small gramatical errors 2016-11-22 16:11:44 +01:00
Mike Hearn
d55361dde3 Tech white paper: address more review comments 2016-11-22 15:13:44 +01:00
Mike Hearn
3200b77582 Tech white paper: more review comments addressed 2016-11-22 15:13:44 +01:00
Clinton Alexander
1660ec95b8 Merged in clint-readme (pull request #511)
Updated Readme, new license file and contributor file
2016-11-22 11:58:24 +00:00
Clinton Alexander
5476e48b56 Added a convenience HTML file for redirecting to the main docs. 2016-11-22 11:56:46 +00:00
Richard Green
4f6ad344fe Adding glossary 2016-11-22 11:35:57 +00:00
Mike Hearn
235cee6727 Add a startup banner and suppress console logging unless --log-to-console is passed on the command line. 2016-11-21 16:08:36 +01:00
Andrius Dagys
64299591c3 Rename PublicKeyTree -> CompositeKey and unify terminology across documentation. 2016-11-21 14:47:19 +00:00
Richard Green
50415d2afa Merged in rg_doc_changes_2 (pull request #500)
Changes from a doc review that were omitted in first PR, also changes from corda=samples repo
2016-11-20 13:39:10 +00:00
Richard Green
e4f00825a4 From document review 2016-11-20 12:12:20 +00:00
Andrius Dagys
0d56846b1b Added a distributed notary that uses the Raft consensus algorithm (implemented by Copycat).
The notary operates by storing committed input states in a map state machine which is replicated across the Copycat cluster.
2016-11-18 18:13:19 +00:00
Richard Green
2ec18d322f Changes from a doc review that were omitted in first PR, also changes from corda=samples repo 2016-11-18 17:58:52 +00:00
Rick Parker
e65b2f0478 Merged in parkri-extensible-rpc-kryo-types (pull request #492)
RPC Kryo plugin functionality.
2016-11-18 17:39:06 +00:00
rick.parker
6abb5750bf RPC Kryo plugin functionality. 2016-11-18 17:38:05 +00:00
Richard Green
e5d7f3fb98 Merged in rg_doc_changes (pull request #474)
First revision for 'getting set up' - docs not rebuilt as to keep changes visible
2016-11-18 16:49:54 +00:00
Rick Parker
f90c5a702a Merged in parkri-new-docs-layout (pull request #494)
Doc index structure change
2016-11-18 14:13:52 +00:00
Mike Hearn
648ab43e35 Regen docsite 2016-11-18 13:57:39 +01:00
Mike Hearn
1d9511f944 Docs: actually tweak the CSS 2016-11-18 13:57:06 +01:00
Mike Hearn
fe7ec58f58 Docs: minor tweak to the CSS 2016-11-18 13:47:42 +01:00
Mike Hearn
f5fc11bf07 Docs: Remove no longer used directory from the Dokka paths to search. 2016-11-18 13:28:52 +01:00
rick.parker
864a48b800 Doc index structure change 2016-11-18 12:17:32 +00:00
Mike Hearn
0ed3855051 Docs: add load testing page to the appendix 2016-11-18 13:16:06 +01:00
David Lee
5718bf9fdf Modified CSS to bring docs theme into alignment with R3 corporate theme and corda.net website aesthetics.
Signed-off-by: David Lee <david.lee@r3cev.com>
2016-11-18 13:15:03 +01:00
Mike Hearn
859542b2df Samples: make the IRS demo usable from the command line again 2016-11-18 13:02:12 +01:00
Mike Hearn
b3a70c7acb Samples: make the attachment demo runnable from the command line again. 2016-11-18 13:02:11 +01:00
Mike Hearn
7265614d5c Samples: trader-demo can now be run from the command line with gradle 2016-11-18 13:02:11 +01:00
Clinton Alexander
92a2ffedd2 Updated documentation regarding the running of nodes on Windows to reflect the new runnodes.bat file. 2016-11-17 18:25:49 +00:00
Clinton Alexander
2b96f7e79e Many fixes to get gradle plugins and other projects working post-merge. 2016-11-17 17:09:31 +00:00
Richard Green
c370e01e68 From comment review PR 2016-11-17 16:31:08 +00:00
Mike Hearn
6240ba48e1 Fix up the visualiser tool after the net.corda move and broken instructions from the repo moves 2016-11-17 17:29:58 +01:00
Mike Hearn
b56548a427 Make runnodes open up a separate tab for each node on MacOS X and a separate xterm on Linux. Update the docs a bit. 2016-11-16 15:49:10 +01:00
Mike Hearn
9d7bfe4229 Publish technical white paper to the docsite 2016-11-16 14:57:14 +01:00
Mike Hearn
b19c6de69a Tech white paper: new sections on privacy, data distribution groups (aka clubs), notary involvement with data distribution. 2016-11-16 14:55:00 +01:00
Andras Slemmer
07df9f17b3 loadtest: Add loadtest code 2016-11-15 17:21:26 +00:00
Andras Slemmer
e6f9570fff docs: Update Client RPC API tutorial with how to initiate protocols 2016-11-15 16:51:07 +00:00
Mike Hearn
bebcf630ba Tech white paper: address review comments 2016-11-15 15:02:54 +01:00
Mike Hearn
ebaaf4346a Tech white paper: new sections on contract DSLs, clauses, scalability, obligations, future work and the conclusion. Two more TODO sections added. 2016-11-15 15:02:54 +01:00
Shams Asari
c326a9ae46 Moved the RPC user config out of the properties file and into the main config file 2016-11-15 12:52:08 +00:00
Richard Green
c4afa4ae63 First revision for 'getting set up' - docs not rebuilt as to keep changes visible 2016-11-14 18:12:39 +00:00
Mike Hearn
9d93eed56d Tech white paper: brief note on event scheduling 2016-11-11 14:25:56 +01:00
Mike Hearn
3b6e3712b2 Tech white paper: client RPC and reactive collections. 2016-11-11 14:25:56 +01:00
Mike Hearn
fe325b2a0c Add TODOs and incompleteness warning 2016-11-11 14:19:46 +01:00
Mike Hearn
a080d7d227 Minor: add back doctrees branch too 2016-11-11 14:17:28 +01:00
Mike Hearn
53c2cff812 Regen docsite 2016-11-11 12:52:29 +01:00
Mike Hearn
ce99f354cb Rename com.r3corda -> net.corda 2016-11-10 17:14:24 +01:00
Mike Hearn
5da00e802e Tech white paper: address review comments 2016-11-09 18:26:48 +01:00
Mike Hearn
0d6df37a0e Tech white paper: notaries and the vault 2016-11-09 18:26:48 +01:00
Mike Hearn
fad1efd143 Tech white paper: client side signing devices 2016-11-09 18:26:47 +01:00
Mike Hearn
e94c5b869b Regen docsite 2016-11-08 19:21:50 +01:00
Katarzyna Streich
21b4ab0c26 Add transaction tear-offs documentation. 2016-11-08 17:45:28 +00:00
Mike Hearn
2db2854a0b Merged in mike-fix-cordapp-docs (pull request #460)
Minor tweaks to cordapp gradle plugin docs
2016-11-08 15:59:02 +00:00
Clinton Alexander
1e5c41eae1 Merged in clint-demodocfix (pull request #458)
Updated the documentation on running demos
2016-11-08 15:02:17 +00:00
Mike Hearn
686b53f768 Fix Cordapp docs which don't use the right gradle syntax. Minor tweaks in AbstractNode 2016-11-08 15:40:44 +01:00
Andras Slemmer
c0e08bee60 Merged in aslemmer-update-ports-in-docs (pull request #457)
docs: Update ports in creating-a-cordapp
2016-11-08 13:58:26 +00:00
Clinton Alexander
3dab869fd4 Updated the documentation about how to run the attachment and SIMM demos. 2016-11-08 12:12:33 +00:00
Clinton Alexander
db20b80d1a Updated the documentation on running demos for the IRS and trader demo. 2016-11-08 12:04:30 +00:00
Andras Slemmer
356b9fac37 docs: Fix generate-docsite.sh to use virtualenv instead of global pip, chmod +x 2016-11-07 18:21:01 +00:00
Andras Slemmer
c306eddb91 docs: Update ports in creating-a-cordapp 2016-11-07 18:12:13 +00:00
Mike Hearn
fc638d319b Regen docsite 2016-11-07 17:57:02 +01:00
Mike Hearn
2032ab27ad Fix generate-docsite.sh script 2016-11-07 17:57:01 +01:00
Mike Hearn
3ae25dbff5 Release notes for M5
Add a snapshot of the tech whitepaper.

Misc doc fixes. Change README to prepare for the open source release.
2016-11-07 17:57:01 +01:00
Clinton Alexander
0ea6a88682 Merged in clint-docscriptfix (pull request #438)
Merged the two docsite generation scripts.
2016-11-04 16:00:50 +00:00
Clinton Alexander
2bc8f8414d Merged in clint-contractsrename (pull request #446)
Renamed contracts project to finance to better reflect the purpose of the project.
2016-11-04 15:18:19 +00:00
Patrick Kuo
6525de7e17 Explorer Doc 2016-11-04 13:41:21 +00:00
Clinton Alexander
7e198e7cf3 Renamed contracts project to finance to better reflect the purpose of the project. 2016-11-04 13:35:25 +00:00
Clinton Alexander
d937a5805e Merged in clint-gradleinstallfix (pull request #439)
Gradle install now installs all packages to maven local
2016-11-04 11:39:28 +00:00
Mike Hearn
226b624004 Tech white paper: Oracles and tearoffs, encumbrances, contract constraints, assets and obligations, deterministic JVM 2016-11-04 11:07:47 +01:00
Clinton Alexander
59a86c364b Documentation now refers devs to use install over publishToMavenLocal 2016-11-03 15:58:46 +00:00
Clinton Alexander
02be542d52 Merged the two docsite generation scripts. 2016-11-03 13:53:31 +00:00
Clinton Alexander
acaa9f82a5 Rewrote some documentation about the simm demo. Moved a util function to the main utils file. 2016-11-03 11:03:54 +00:00
Clinton Alexander
1a892886ac Added instructions for running simm valuation demo. 2016-11-03 11:01:36 +00:00
Richard Green
26b3c0173d Fixing grammar 2016-11-03 11:01:36 +00:00
Clinton Alexander
ca2a37915d Review fixes for docs. 2016-11-03 11:01:36 +00:00
Clinton Alexander
73a2215747 Added core changes and docs required for simm valuation demo. 2016-11-03 11:01:36 +00:00
Shams Asari
6d39b71bf9 Simple RPC access control, with a demo control on the cash RPCs 2016-11-03 10:46:25 +00:00
Mike Hearn
2744d8abaa Tech white paper: new sections on the data model, identity lookups, attachments, dispute resolution, compound keys, timestamps. 2016-11-01 16:40:59 +01:00
Shams Asari
e2d6ace449 RPC client authentication using user/password from config file 2016-10-20 17:55:16 +01:00
Mike Hearn
68e0ddecc0 Address review comments 2016-10-12 15:17:40 +02:00
Mike Hearn
180c9acaff First section of Corda technical whitepaper 2016-10-12 15:17:40 +02:00
Mike Hearn
b7afd54d29 Minor: docs, fix header level in cordapp page. 2016-10-12 12:54:23 +02:00
Mike Hearn
8ea620b1a2 Regen docsite 2016-10-12 12:24:38 +02:00
Clinton Alexander
24f178a3e5 Renamed notary to controller to be more clear. 2016-10-11 16:55:50 +01:00
Clinton Alexander
427049e400 Removed unused functions, added Javadoc to properies. Added advertisedServices as a default field. 2016-10-11 16:41:12 +01:00
Clinton Alexander
3bfee7d051 Typo fix. 2016-10-11 13:05:46 +01:00
Clinton Alexander
bb299de9e1 Further expanded example build.gradle. 2016-10-11 13:05:46 +01:00
Clinton Alexander
8816fb35ea Expanded the example build.gradle. 2016-10-11 13:05:46 +01:00
Clinton Alexander
ddce92007e Fixed text to clarify what Cordformation is. 2016-10-11 13:05:46 +01:00
Clinton Alexander
1754493490 Fixed review issues. 2016-10-11 13:05:46 +01:00
Clinton Alexander
5d894138c2 Review fixes for documentation and gitignore. 2016-10-11 13:05:46 +01:00
Clinton Alexander
efb4629a44 Moved the plugins docs into the creating a cordapp doc. 2016-10-11 13:05:46 +01:00
Clinton Alexander
3d868016ae Moved some documentation into the relevant readmes. 2016-10-11 13:05:46 +01:00
Clinton Alexander
d651c2c408 Review fixes for cordapp plugins. 2016-10-11 13:05:46 +01:00
Clinton Alexander
eaf404f51d Added some documentation about cordapp plugins. 2016-10-11 13:05:46 +01:00
Matthew Nesbit
1388454396 Never send transactions to the Notary that aren't signed by all parties. Toughen up to use validating Notary in general and put Client precheck into NotaryProtocol.
Rename method to better reflect its actions

Handle comments from PR

Correct indentation
2016-10-11 10:43:40 +01:00
Mike Hearn
f4b113cc7e Regen docsite 2016-10-11 11:31:20 +02:00
Mike Hearn
b094b0f4df Minor: fix a couple of docsite warnings 2016-10-11 11:31:20 +02:00
Mike Hearn
03cc776dd0 Release notes for M4 2016-10-11 11:27:15 +02:00
Andras Slemmer
fd6af7fbb2 docs: Fix path in client rpc api tutorial 2016-10-10 10:12:35 +01:00
rick.parker
2e3952ee1f H2 database exported via configurable port number. 2016-10-06 14:33:56 +01:00
Andrius Dagys
4dedb6fc2e Updated unfinished sentence in the docs 2016-10-05 17:48:04 +01:00
Andrius Dagys
893f6e4f50 Updated config docs 2016-10-05 17:48:04 +01:00
Andrius Dagys
e5c0c975bd Remove hostNotaryServiceLocally config property – nodes need to specify the correct notary service type in extraAdvertisedServiceIds 2016-10-05 17:48:04 +01:00
Ross Nicoll
f1557e687b Add attachement demo and documentation
Add a demo of attachments on transactions as a worked example for others to use, along with documentation
on how to run it, and how it functions.
2016-10-05 14:29:20 +01:00
rick.parker
0266d6e3d6 Fix typo in persistence docs. 2016-10-05 11:46:40 +01:00
Clinton Alexander
38ba8c8759 Merge branch 'clint-cordamaven' 2016-10-05 11:44:11 +01:00
rick.parker
ec975b0426 Hibernate ORM implementation for states. 2016-10-05 11:40:27 +01:00
Clinton Alexander
4d213698df Updated docs to document building against Corda. 2016-10-05 11:35:12 +01:00
Andras Slemmer
07e528c659 docs: Address review comments 2016-10-05 10:40:18 +01:00
Andras Slemmer
3b77de67b6 docs: add docs/source/example-code module, tutorial on the Client RPC API 2016-10-05 10:40:18 +01:00
Shams Asari
67fdf9b2ff Automatic session management between two protocols, and removal of explict topics 2016-10-03 15:21:27 +01:00
Andrius Dagys
a26908e83b Added docs for PublicKeyTree/multi-signature support 2016-10-03 11:09:36 +01:00
Ross Nicoll
12fd70c742 Restructure consensus documentation
Restructure consensus documentation to improve content grouping
2016-09-30 17:09:16 +01:00
Mike Hearn
114906089f Minor: fix TOC issue 2016-09-26 14:48:40 +02:00
Mike Hearn
b775a4023e Minor: fix typo in release notes 2016-09-26 14:48:39 +02:00
Mike Hearn
3f9fc2db85 Minor: fix some minor indent/formatting issues in the docs 2016-09-23 11:55:40 +02:00
Mike Hearn
9551b0c7e5 Regen docsite 2016-09-23 11:55:23 +02:00
Ross Nicoll
ebda724f14 Change references to 'wallet' with 'vault' 2016-09-20 18:14:53 +01:00
Ross Nicoll
119f923932 Add documentation for network simulator 2016-09-19 11:57:14 +01:00
Ross Nicoll
47e404f8b0 Remove docs on network visualiser 2016-09-19 11:53:41 +01:00
Mike Hearn
4d83f1489f Add a client library that provides an RPC mechanism for talking to the Corda node.
The RPC mechanism uses message queues and is essentially conventional except for the fact that it supports marshalling observables. An observable encapsulates a stream of ongoing events, and server-side observables sent to the client are automatically bound to message queues and managed by Artemis.
2016-09-16 10:13:21 +01:00
Mike Hearn
53967e26ae Minor type fix in the encumbrances doc section 2016-09-09 09:31:52 +00:00
jamescarlyle
b7e6c210d9 Merge with master
# Conflicts:
#	docs/build/html/_sources/index.txt
#	docs/build/html/_sources/protocol-state-machines.txt
#	docs/build/html/_sources/tutorial-contract-clauses.txt
#	docs/build/html/index.html
#	docs/build/html/protocol-state-machines.html
#	docs/build/html/searchindex.js
#	docs/build/html/tutorial-contract-clauses.html
#	docs/build/html/tutorial-contract.html
2016-09-09 09:43:14 +01:00
jamescarlyle
455a0ac9c9 Tidied document code example 2016-09-08 23:02:01 +01:00
jamescarlyle
e187c4d91d Further tweaks based on feedback - simplified the embedded timelock contract 2016-09-08 22:49:24 +01:00
Matthew Nesbit
1f2a6d256e Simplify the FullNodeConfiguration now that an explicit identity for the NetworkMapService isn't a problem.
Use consistent if style

Don't include NetworkMapAddress in config if hosting locally
2016-09-07 15:35:50 +01:00
Mike Hearn
fa4b503f81 Minor: rename UntrustworthyData.validate to UntrustworthyData.unwrap to better indicate its purpose and deprecate the old name. 2016-09-07 13:09:39 +02:00
Mike Hearn
423aff477a Add a short document that describes things to watch out for when writing Corda app code. 2016-09-07 13:09:39 +02:00
jamescarlyle
cdb2c3efa6 updated following review 2016-09-06 17:56:01 +01:00
Ross Nicoll
203c4fb3d8 Merge ConcreteClause into Clause
Change Clause to an abstract class, and merge ConcreteClause into it. CompositeClause now
overrides defaults provided in Clause which are more suitable for composition of clauses.
2016-08-31 17:55:36 +01:00
Mike Hearn
f7b2834461 Regen docsite 2016-08-31 17:16:06 +02:00
Mike Hearn
75a9c498a4 Fixup release notes 2016-08-31 17:14:42 +02:00
Matthew Nesbit
638dfc902a docs
Include database config section for completeness

Incorporate comments from review

Incorporate comments from review
2016-08-31 11:47:25 +01:00
Mike Hearn
baac38c936 Release notes for M3 2016-08-30 14:40:12 +02:00
Mike Hearn
89419f2444 Regen docsite 2016-08-30 13:05:32 +02:00
Mike Hearn
cc2209f7b1 Docsite: add a warning to the index page about the docsite being for master, and update the release process doc to remind the release master to remove it on the branch. 2016-08-30 12:53:34 +02:00
Mike Hearn
5a5377f0a1 Docs: Remove warning that says Corda is developed on MacOS, it is no longer true as we have a mix of platforms in the team these days. 2016-08-30 12:48:33 +02:00
Mike Hearn
e11732dad3 Merged in mike-refresh-docs-for-m3 (pull request #299)
Refresh the documentation site (developer guide): fresh docs are happy docs!
2016-08-26 18:57:27 +02:00
Ross Nicoll
13b040ecd6 Rework clauses to use composition
Rework clauses so that rather than defining match/no-match behaviour themselves, they are
now composed by nesting them within clauses that understand how to match their child clauses.
This unifies a lot of the structure of clauses and removes corner cases needed for the first
design, as well as moving towards a model which is easier to prove.
2016-08-26 17:35:52 +01:00
Mike Hearn
3e94fc1921 More review fixes 2016-08-26 13:05:26 +02:00
Mike Hearn
2f35dbc339 Refresh the documentation site (developer guide): fresh docs are happy docs! 2016-08-26 12:58:33 +02:00
Ross Nicoll
ad8ffca0b4 Add CommitTransactionProtocol
Add new protocol which manages the entire process of taking a signed transaction ready
for notarisation, through notarisation and onto recording it both locally and informing
remote nodes.

This protocol also optionally can include the ClientToServiceCommand which triggered a transaction
being created, to give the remote nodes context on why a change occurred (i.e. "You are being sent
£100")
2016-08-25 16:30:39 +01:00
Clinton Alexander
4cb6d11e9f Merged in clint-caplet (pull request #292)
Node server now loads plugins/cordapps from directory
2016-08-25 13:46:50 +01:00
Mike Hearn
bf41d66c6d Merged in whitepaper-minor-edits-prerelease (pull request #298)
Whitepaper minor edits prerelease
2016-08-25 11:28:58 +02:00
Clinton Alexander
f2a93ea67b Fixed review comments. 2016-08-24 21:03:20 +01:00
Clinton Alexander
bdcbd80d4e Updated docs to reflect gradle changes. 2016-08-24 16:30:35 +01:00
Clinton Alexander
70c057dfef Review changes. 2016-08-24 16:19:11 +01:00
Clinton Alexander
c03d9a2cf7 Review fixes. 2016-08-24 15:33:43 +01:00
Ross Nicoll
b8ec7631b4 Update introduction to messaging documentation 2016-08-23 17:43:42 +01:00
Ross Nicoll
59d3cbdece Add documentation around Commodity and CommodityContract 2016-08-23 17:40:45 +01:00
Mike Hearn
3b8712627d Regen docsite 2016-08-23 14:29:46 +02:00
Ross Nicoll
03e120d04b Add default values for ifMatched/ifNotMatched/requiredCommands 2016-08-23 11:23:47 +01:00
Clinton Alexander
214c98b6aa Added first Cordapp documentation. 2016-08-23 10:25:06 +01:00
Richard G Brown
47cc33deb1 Final edit - simplification 2016-08-21 10:15:08 +01:00
Richard G Brown
932038ef9b Edits in response to Tim Swanson, Clark Thompson, Kathleen Breitman 2016-08-20 14:19:57 +01:00
richard
5df740b2fa regen PDF as not compiled correctly first time 2016-08-19 15:01:31 +01:00
richard
fe8cd540d1 Minor edits prior to release 2016-08-19 12:45:23 +01:00
Mike Hearn
44aa32f70c Add some documentation on writing protocol unit tests. 2016-08-12 17:14:55 +02:00
Mike Hearn
8c7de8a69c Merged in corda-whitepaper (pull request #278)
Add Corda Whitepaper to Documentation
2016-08-11 18:01:12 +02:00
Ross Nicoll
162d19deeb Change how clause verification is called
Change away from extending ClauseVerifier for contracts which support clauses, and explicitely call
clause verification code in the verify() function. This should make the flow of control easier to understand.
2016-08-11 15:39:11 +01:00
richard
9e9f75b932 Added Corda Whitepaper 2016-08-11 13:57:41 +01:00
Mike Hearn
4e0468333d Regen docsite 2016-08-09 12:21:07 +02:00
Mike Hearn
25f65a60c7 Address review comments. 2016-08-05 14:04:07 +02:00
Mike Hearn
9b89d62c36 Docs: adjust the docsite to reflect the tx types refactoring 2016-08-04 13:05:51 +02:00
Mike Hearn
1081e8d2ce Regen docsite 2016-08-01 13:16:47 +02:00
Mike Hearn
a5c8df8dab # This is a combination of 2 commits.
# The first commit's message is:

Release notes for M2

# The 2nd commit message will be skipped:

#	Docs: Address release notes review comments, re-arrange the sidebar and mention the new TF code that has been added.
2016-08-01 13:12:39 +02:00
Ross Nicoll
98aac62a42 Add contract catalogue to documentation 2016-07-29 11:59:28 +01:00
Clinton Alexander
5410f8b228 Merged in demowebui (pull request #230)
Added an IRS demo web interface
2016-07-28 13:19:32 +01:00
Mike Hearn
7e6c1332e7 Regen docsite 2016-07-28 12:20:11 +02:00
Clinton Alexander
f4e8537cf0 Fixed documentation. 2016-07-28 09:26:47 +01:00
Clinton Alexander
77245bdc1a Fixed a typo in the docs. 2016-07-25 11:55:23 +01:00
Clinton Alexander
19e3f7f0cb Updated documentation to use the new endpoints. 2016-07-25 10:53:38 +01:00
Clinton Alexander
11afce9bbf Review fixes. 2016-07-22 12:44:42 +01:00
Clinton Alexander
ac040efe94 Added instructions for unix installs. 2016-07-19 09:24:39 +01:00
Clinton Alexander
0a29ba4594 Added installation instructions for the demo web UI 2016-07-18 14:39:22 +01:00
Mike Hearn
1715941dce Regen docsite 2016-07-14 10:55:35 +02:00
Ross Nicoll
c32af56b41 Rebuild commercial paper contracts using clauses 2016-07-13 16:55:18 +01:00
Clinton Alexander
bfeea97013 Added documentation for the web demo. 2016-07-13 16:43:13 +01:00
Ross Nicoll
27241fb10a Rebuild documentation 2016-07-12 17:52:52 +01:00
Ross Nicoll
1943b3633f Add documentation on contract clauses 2016-07-12 17:47:51 +01:00
Ross Nicoll
e09710e421 Update contract tutorial example to match JavaCommercialPaper 2016-07-12 14:48:50 +01:00
Ross Nicoll
bb294da857 Minor: Correct class name in tutorial
Correct a reference to "Cash" in the tutorial, is actually "CommercialPaper"
2016-07-12 11:55:52 +01:00
Mike Hearn
0a2f313d40 Minor: run IntelliJ 'code cleanup' 2016-07-11 18:15:28 +02:00
Andras Slemmer
d0903ae265 docs: Rename test tutorial subtitle 2016-07-11 14:25:27 +01:00
Andras Slemmer
dae39bbfc1 docs: Add tutorial on the test DSL 2016-07-11 14:25:27 +01:00
Andras Slemmer
8ca73e51d4 docs: Add build_docs.sh 2016-07-11 12:17:18 +01:00
Mike Hearn
ad3e9be1c8 Add a version number to gradle and allow "gradle install" to install the core module to the local Maven repository. 2016-07-07 13:59:55 +01:00
Mike Hearn
4356cef1cd Regen docsite 2016-06-30 14:49:28 +02:00
Ross Nicoll
2121824662 Rename com.r3cord.contracts.cash package to ...asset 2016-06-30 13:31:59 +01:00
Mike Hearn
63cc3a04ce Review feedback 2016-06-30 12:59:19 +02:00
Andrius Dagys
b30e431766 Update release notes regarding use of TransactionBuilder 2016-06-30 11:46:26 +01:00
Mike Hearn
55675ef799 Refresh docs for M1 release. 2016-06-30 12:23:27 +02:00
rick.parker
5271882dcd Event scheduling and docs for event scheduling 2016-06-30 08:51:52 +01:00
Mike Hearn
cb90a8c09b Add a policy about compiler warnings. 2016-06-27 15:41:18 +02:00
Andrius Dagys
e5e5383e71 Minor formatting and typo fixes 2016-06-22 14:36:01 +01:00
Andrius Dagys
9f1a4e9254 Update docs relating to the multiple notary support work 2016-06-22 13:18:00 +01:00
Andras Slemmer
a8ce69ccb9 docs: add release note on curve switch 2016-06-16 17:03:44 +01:00
Ross Nicoll
ad72f3e48f Add issuer to cash amounts
Add issuer of a cash when referring to amounts of cash (except for the very few cases where
the issuer is not important, such as when referring to aggregated totals across a set of
issuers). Replaces CommonCashState with TokenDefinition, as a more accurate reflection of
what the class represents.
2016-06-16 15:05:49 +01:00
Mike Hearn
aa0a68ba36 Merged in rnicoll-docs-rebuild (pull request #153)
Rebuild documentation
2016-06-16 13:14:50 +02:00
rick.parker
72842eaaf4 Code style changes for properties 2016-06-16 09:43:33 +01:00
Ross Nicoll
2fed96cad0 Rebuild documentation 2016-06-15 17:10:43 +01:00
Ross Nicoll
76a5328e4b Replace TokenDefinition with Issued 2016-06-13 17:39:42 +01:00
Ross Nicoll
a96a05d857 Add note about party type being likely to change 2016-06-13 17:38:18 +01:00
Ross Nicoll
92b25af092 Clarified contents of WireTransaction 2016-06-13 17:38:18 +01:00
Ross Nicoll
14463266db Add definition of state interfaces 2016-06-13 17:38:18 +01:00
Ross Nicoll
4b39ab0357 Clear up wording around how the FungibleAsset superclass is used
Clear up wording around how the FungibleAsset superclass is used, and in particular
that it contains contract code, but provides an interface that should be extended by
subclass state objects.
2016-06-13 17:38:18 +01:00
Ross Nicoll
8d1ac66787 Remove Business Calendar header 2016-06-13 17:38:18 +01:00
Ross Nicoll
874892df93 Move fungible definition up the document 2016-06-13 17:38:18 +01:00
Ross Nicoll
fc3bc163aa Tweak wording (state -> states) 2016-06-13 17:38:18 +01:00
Ross Nicoll
9cdcaaa606 Add documentation of transaction data types 2016-06-13 17:38:18 +01:00
Clinton Alexander
146f274dd0 Demo now requires the setup steps if the configuration is not default. Documentation updated to reflect these changes. 2016-06-08 16:31:58 +01:00
Clinton Alexander
782d50958d IRS demo endpoints are now parameterised for the Trade and Demo modes. Documentation fixes. 2016-06-08 16:30:40 +01:00
Clinton Alexander
0c94637685 Documentation now has separate Windows instructions for running the demos. 2016-06-08 16:30:40 +01:00
Clinton Alexander
fad45eaa91 Updated documentation for the IRS demo. 2016-06-08 16:29:21 +01:00
Ross Nicoll
f4f0e160d2 Genericise Cash contract to support non-Currency things
Split the verification and commands for the Cash contract into a new AbstractCashLike
class, and make Cash a concrete implementation of that class, specialised for dealing
with Currency as the underlying token.
2016-06-07 13:49:26 +01:00
Ross Nicoll
d7b367965f Genericise Amount class
Make the Amount class generic so it doesn't have to represent a quantity of a
currency, but can handle other things such as assets as well, or extended detail
(for example a currency-issuer tuple).
2016-06-01 11:58:13 +01:00
Ross Nicoll
fc62010da6 Move cash contract into its own package 2016-05-31 17:07:36 +01:00
Mike Hearn
bb8944ab17 Docsite: more info on how to cut a release.
In future this will get more complicated as we make the code know its own version, etc. But for now it'll do.
2016-05-25 11:52:16 +02:00
Mike Hearn
4065cb25c0 Regen docsite 2016-05-24 13:48:53 +02:00
Mike Hearn
eabffb7fda Docsite: fix minor issues in the running-the-demos page 2016-05-24 13:48:35 +02:00
Mike Hearn
b6c3359cde Docs: regen docsite 2016-05-24 13:27:23 +02:00
Mike Hearn
68824e9d7e Docsite: added a release notes page 2016-05-24 13:27:16 +02:00
Mike Hearn
1e9f97f890 Docs: regen docsite for new where to start page. 2016-05-23 18:54:38 +02:00
Mike Hearn
1877491a9a Merged in full-scenario-tutorial-doc (pull request #105)
Docs: add a doc that describes how to link the other tutorials together into a demo.
2016-05-23 18:54:09 +02:00
Mike Hearn
8488e4d3ff Regen docsite 2016-05-23 18:05:37 +02:00
Mike Hearn
fffeb4caa9 Docs: fix a typo that caused a parse failure. 2016-05-23 18:03:31 +02:00
Matthew Nesbit
a7c0296f6b Rename node.core to node.internal from Rick's suggestion not to use core outside of the core package. 2016-05-20 16:43:01 +01:00
Matthew Nesbit
f6f56797ce Refactor code into clear core, contracts and node namespaces. Move services into clear implementation and api sides. Push unit tests down to lowest level of dependency hierarchy possible. 2016-05-20 16:42:59 +01:00
Mike Hearn
6c31420d23 Minor: typo fix in running-the-demos.rst doc. 2016-05-19 12:38:00 +02:00
Mike Hearn
073f4a8e7e Merged in docs-setup (pull request #103)
Improve Set Up documentation
2016-05-19 12:22:24 +02:00
Mike Hearn
5e70646bd2 Refactor the trader demo and add comments to make it easier to customise. 2016-05-18 19:10:49 +02:00
Mike Hearn
6f1e2047dd Docs: add a doc that describes how to link the other tutorials together into a demo. 2016-05-18 19:05:33 +02:00
Wawrzyniec Niewodniczanski
ed3b33af19 Cosmetic change
- missing word
- wrong URL
2016-05-18 18:00:38 +01:00
Wawrzyniec Niewodniczanski
6896af25b2 Merge branch 'setup-docs-changes' of bitbucket.org:R3-CEV/r3prototyping into docs-setup 2016-05-18 10:44:11 +01:00
Wawrzyniec Niewodniczanski
e5ef9b28b7 Improve Set Up documentation
- there seems to be some changes to IntelliJ
- some further clarification
2016-05-18 10:39:47 +01:00
Mike Hearn
06cf7a21be Docs: misc markup fixes and adjust an out of date paragraph about oracles. 2016-05-17 19:40:53 +02:00
Mike Hearn
e1f899647a Modify the trader demo so it doesn't need a shell script to start it anymore. Now all configuration is in the driver program. 2016-05-17 18:13:24 +02:00
Matthew Nesbit
4fd32c3455 Merge remote-tracking branch 'remotes/origin/master' into mnesbit-cor-174-reorganise-for-bank-developers 2016-05-16 15:27:44 +01:00
Mike Hearn
e38b101970 Merged in release-process-docs (pull request #88)
Add a page that briefly describes the proposed release process.
2016-05-16 15:55:31 +02:00
Matthew Nesbit
c30564d813 Remove my original project structure proposal, because it doesn't the actual state of refactoring. 2016-05-16 14:51:38 +01:00
Matthew Nesbit
058ac986bd Move contracts base files to namespace to make api aspect clearer in includes.
Move Party to core.crypto as Party is closely aligned with the signing and used in code areas unrelated to the contract code.
2016-05-14 13:47:07 +01:00
Matthew Nesbit
8beaf08239 Convert proposed structure into a doc source file and include in index 2016-05-14 09:33:52 +01:00
Andrius Dagys
7d0ce00978 Minor changes to the Notary doc 2016-05-13 16:17:50 +01:00
Andrius Dagys
0da604e33b Added another chapter on implementation and usage.
Modified TODO comment.
2016-05-13 16:17:50 +01:00
Andrius Dagys
e77d3a40bd Added docs for the Notary 2016-05-13 16:17:50 +01:00
Mike Hearn
d52855bfa2 Regen API docs with new Dokka 2016-05-13 12:55:04 +02:00
Mike Hearn
61605b18e3 Add a page that briefly describes the proposed release process. 2016-05-10 18:44:41 +02:00
Ross Nicoll
9ecf430dde Update documentation to match PartyAndReference naming 2016-05-09 17:55:53 +01:00
Mike Hearn
7499f7cf1f Regen docsite 2016-05-09 18:13:23 +02:00
Richard G Brown
97cb8defd3 Minor edits to data model page and additional section on rationale for UTXO model (including some content from Mike) 2016-05-09 18:12:13 +02:00
Richard G Brown
50e16fb241 Copyright year removed and owner changed from R3 to DLG 2016-05-09 18:08:41 +02:00
Ross Nicoll
20c6be193a Move tutorial.rst to tutorial_contract.rst
Move tutorial.rst to tutorial_contract.rst and rebuild docs
2016-05-09 10:20:40 +01:00
Ross Nicoll
d1bf1b3f92 Update code style documentation
* Remove out of date instruction to put license text in each file.
* Add note that where parameters overflow first line, they should be one-per-line
* Add note on how TODO comments should be structured
2016-05-06 14:59:40 +01:00
Mike Hearn
5eaf86a4b1 Docs: (Re)push auto generated API docs 2016-04-29 18:46:25 +02:00
Mike Hearn
5a3c6e7fed Regen docsite 2016-04-29 18:46:24 +02:00