From 70346c45b3d0ef14ed329673e54553cc4bbc7726 Mon Sep 17 00:00:00 2001 From: David Wray Date: Fri, 27 Jul 2018 15:10:11 +0100 Subject: [PATCH 1/7] ENT-2305: Java Instructions to Invoke Hello World CordApp fail Removed 'Java' instructions --- docs/source/hello-world-running.rst | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/source/hello-world-running.rst b/docs/source/hello-world-running.rst index 4b50e62a87..063223dbbf 100644 --- a/docs/source/hello-world-running.rst +++ b/docs/source/hello-world-running.rst @@ -107,13 +107,7 @@ commands. We want to create an IOU of 99 with PartyB. We start the ``IOUFlow`` by typing: -.. container:: codeset - - .. code-block:: java - - start IOUFlow arg0: 99, arg1: "O=PartyB,L=New York,C=US" - - .. code-block:: kotlin +.. code-block:: kotlin start IOUFlow iouValue: 99, otherParty: "O=PartyB,L=New York,C=US" From ed088562f657713d3b7d55f700ee0216b86a33e2 Mon Sep 17 00:00:00 2001 From: David Wray Date: Fri, 27 Jul 2018 15:14:42 +0100 Subject: [PATCH 2/7] ENT-2302: Hello World Tutorial Page mismatch between code sample and explanatory text Updated text to reflect the correct method. --- docs/source/hello-world-flow.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/hello-world-flow.rst b/docs/source/hello-world-flow.rst index 817de0545a..42bf242dab 100644 --- a/docs/source/hello-world-flow.rst +++ b/docs/source/hello-world-flow.rst @@ -140,7 +140,7 @@ Signing the transaction Now that we have a valid transaction proposal, we need to sign it. Once the transaction is signed, no-one will be able to modify the transaction without invalidating this signature. This effectively makes the transaction immutable. -We sign the transaction using ``ServiceHub.toSignedTransaction``, which returns a ``SignedTransaction``. A +We sign the transaction using ``ServiceHub.signInitialTransaction``, which returns a ``SignedTransaction``. A ``SignedTransaction`` is an object that pairs a transaction with a list of signatures over that transaction. Finalising the transaction From 403407a919c9878f2563542a9a4106adc7f08cb4 Mon Sep 17 00:00:00 2001 From: David Wray Date: Fri, 27 Jul 2018 15:19:44 +0100 Subject: [PATCH 3/7] 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. --- docs/source/hello-world-template.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/hello-world-template.rst b/docs/source/hello-world-template.rst index 616ad7bd78..402f939fb1 100644 --- a/docs/source/hello-world-template.rst +++ b/docs/source/hello-world-template.rst @@ -17,7 +17,7 @@ CorDapp onto a local test network of dummy nodes to test its functionality. CorDapps can be written in both Java and Kotlin, and will be providing the code in both languages in this tutorial. -Note that there's no need to download and install Corda itself. Corda V1.0's required libraries will be downloaded +Note that there's no need to download and install Corda itself. Corda's required libraries will be downloaded automatically from an online Maven repository. Downloading the template From 42a4b9f406143d24ddb6e0892499f41256820b8b Mon Sep 17 00:00:00 2001 From: David Wray Date: Fri, 27 Jul 2018 15:38:40 +0100 Subject: [PATCH 4/7] ENT-2294: CE HA deployment documentation refers to persistent mount commands but none are shown Missing carriage returns caused rendering to fail. Also changed from groovy to bash because it is. --- docs/source/hot-cold-deployment.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/source/hot-cold-deployment.rst b/docs/source/hot-cold-deployment.rst index 4673d8b151..426a8199ab 100644 --- a/docs/source/hot-cold-deployment.rst +++ b/docs/source/hot-cold-deployment.rst @@ -184,7 +184,9 @@ base directory of both primary and back-up VMs. To facilitate operations, a pers appropriate values: .. container:: codeset - .. sourcecode:: groovy + + .. sourcecode:: bash + sudo bash -c 'echo "//.file.core.windows.net/ /mymountpoint cifs vers=2.1,username=,password=,dir_mode=0700,file_mode=0700,serverino" >> /etc/fstab' In the above command, **mymountpoint** represents the location on the VM's file system where the mount point will be created. @@ -209,7 +211,9 @@ The newly created EFS needs to be mounted and linked to the ``artemis`` director primary and back-up VMs. To facilitate operations, a persistent mount point can be created using **/etc/fstab**: .. container:: codeset - .. sourcecode:: groovy + + .. sourcecode:: bash + sudo bash -c 'echo "mount-target-DNS:/ efs-mount-point nfs4 nfsvers=4.1,rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2,_netdev,noresvport 0 0" >> /etc/fstab' .. note:: EFS cannot be mounted on a Windows machine. Please see EFS limits `here `_. From fef494ea9c3a25c1b29a6944bf9f24e8e2d2b6a3 Mon Sep 17 00:00:00 2001 From: David Wray Date: Thu, 9 Aug 2018 12:11:31 +0100 Subject: [PATCH 5/7] Revert "ENT-2298: CE Hello World Tutorial Page references Corda V1.0" This reverts commit 403407a919c9878f2563542a9a4106adc7f08cb4. --- docs/source/hello-world-template.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/hello-world-template.rst b/docs/source/hello-world-template.rst index 402f939fb1..616ad7bd78 100644 --- a/docs/source/hello-world-template.rst +++ b/docs/source/hello-world-template.rst @@ -17,7 +17,7 @@ CorDapp onto a local test network of dummy nodes to test its functionality. CorDapps can be written in both Java and Kotlin, and will be providing the code in both languages in this tutorial. -Note that there's no need to download and install Corda itself. Corda's required libraries will be downloaded +Note that there's no need to download and install Corda itself. Corda V1.0's required libraries will be downloaded automatically from an online Maven repository. Downloading the template From c8872eac6ac25c4066b39d543d540fcb591fb120 Mon Sep 17 00:00:00 2001 From: David Wray Date: Thu, 9 Aug 2018 12:24:00 +0100 Subject: [PATCH 6/7] Revert "ENT-2302: Hello World Tutorial Page mismatch between code sample and explanatory text" This reverts commit ed088562f657713d3b7d55f700ee0216b86a33e2. --- docs/source/hello-world-flow.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/hello-world-flow.rst b/docs/source/hello-world-flow.rst index 42bf242dab..817de0545a 100644 --- a/docs/source/hello-world-flow.rst +++ b/docs/source/hello-world-flow.rst @@ -140,7 +140,7 @@ Signing the transaction Now that we have a valid transaction proposal, we need to sign it. Once the transaction is signed, no-one will be able to modify the transaction without invalidating this signature. This effectively makes the transaction immutable. -We sign the transaction using ``ServiceHub.signInitialTransaction``, which returns a ``SignedTransaction``. A +We sign the transaction using ``ServiceHub.toSignedTransaction``, which returns a ``SignedTransaction``. A ``SignedTransaction`` is an object that pairs a transaction with a list of signatures over that transaction. Finalising the transaction From 528164c173d1810ebb5d8ac16af6c778ac40d836 Mon Sep 17 00:00:00 2001 From: David Wray Date: Thu, 9 Aug 2018 12:26:54 +0100 Subject: [PATCH 7/7] Revert "ENT-2305: Java Instructions to Invoke Hello World CordApp fail" This reverts commit 70346c45b3d0ef14ed329673e54553cc4bbc7726. --- docs/source/hello-world-running.rst | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/source/hello-world-running.rst b/docs/source/hello-world-running.rst index 063223dbbf..4b50e62a87 100644 --- a/docs/source/hello-world-running.rst +++ b/docs/source/hello-world-running.rst @@ -107,7 +107,13 @@ commands. We want to create an IOU of 99 with PartyB. We start the ``IOUFlow`` by typing: -.. code-block:: kotlin +.. container:: codeset + + .. code-block:: java + + start IOUFlow arg0: 99, arg1: "O=PartyB,L=New York,C=US" + + .. code-block:: kotlin start IOUFlow iouValue: 99, otherParty: "O=PartyB,L=New York,C=US"