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.

docs/source/example-code/src/main/java/com/template/TemplateContract.java

@@ -1,4 +1,4 @@
-package net.corda.docs.java.tutorial.helloworld;
+package com.template;
 
 import net.corda.core.contracts.CommandData;
 import net.corda.core.contracts.Contract;

docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/helloworld/IOUFlow.java

@@ -1,17 +1,21 @@
 package net.corda.docs.java.tutorial.helloworld;
 
-// DOCSTART 01
 import co.paralleluniverse.fibers.Suspendable;
+import com.template.TemplateContract;
+import net.corda.core.flows.*;
+
+// DOCSTART 01
+// Add these imports:
 import net.corda.core.contracts.Command;
 import net.corda.core.contracts.CommandData;
-import net.corda.core.flows.*;
 import net.corda.core.identity.Party;
 import net.corda.core.transactions.SignedTransaction;
 import net.corda.core.transactions.TransactionBuilder;
 import net.corda.core.utilities.ProgressTracker;
 
-import static net.corda.docs.java.tutorial.helloworld.TemplateContract.TEMPLATE_CONTRACT_ID;
+import static com.template.TemplateContract.TEMPLATE_CONTRACT_ID;
 
+// Replace TemplateFlow's definition with:
 @InitiatingFlow
 @StartableByRPC
 public class IOUFlow extends FlowLogic<Void> {

docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/helloworld/IOUState.java

@@ -1,13 +1,15 @@
 package net.corda.docs.java.tutorial.helloworld;
 
-// DOCSTART 01
-import com.google.common.collect.ImmutableList;
 import net.corda.core.contracts.ContractState;
 import net.corda.core.identity.AbstractParty;
-import net.corda.core.identity.Party;
-
 import java.util.List;
 
+// DOCSTART 01
+// Add these imports:
+import com.google.common.collect.ImmutableList;
+import net.corda.core.identity.Party;
+
+// Replace TemplateState's definition with:
 public class IOUState implements ContractState {
     private final int value;
     private final Party lender;

docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/twoparty/IOUContract.java

@@ -1,20 +1,25 @@
 package net.corda.docs.java.tutorial.twoparty;
 
-// DOCSTART 01
-import com.google.common.collect.ImmutableList;
 import net.corda.core.contracts.CommandData;
-import net.corda.core.contracts.CommandWithParties;
 import net.corda.core.contracts.Contract;
-import net.corda.core.identity.Party;
 import net.corda.core.transactions.LedgerTransaction;
 
+// DOCSTART 01
+// Add these imports:
+import com.google.common.collect.ImmutableList;
+import net.corda.core.contracts.CommandWithParties;
+import net.corda.core.identity.Party;
+
 import java.security.PublicKey;
 import java.util.List;
 
 import static net.corda.core.contracts.ContractsDSL.requireSingleCommand;
 import static net.corda.core.contracts.ContractsDSL.requireThat;
 
+// Replace TemplateContract's definition with:
 public class IOUContract implements Contract {
+    public static final String IOU_CONTRACT_ID = "com.template.IOUContract";
+
     // Our Create command.
     public static class Create implements CommandData {
     }

docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/twoparty/IOUFlow.java

@@ -45,15 +45,14 @@ public class IOUFlow extends FlowLogic<Void> {
         // We retrieve the notary identity from the network map.
         final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
 
+        // DOCSTART 02
         // We create a transaction builder.
         final TransactionBuilder txBuilder = new TransactionBuilder();
         txBuilder.setNotary(notary);
 
-        // DOCSTART 02
         // We create the transaction components.
         IOUState outputState = new IOUState(iouValue, getOurIdentity(), otherParty);
-        String outputContract = IOUContract.class.getName();
-        StateAndContract outputContractAndState = new StateAndContract(outputState, outputContract);
+        StateAndContract outputContractAndState = new StateAndContract(outputState, IOUContract.IOU_CONTRACT_ID);
         List<PublicKey> requiredSigners = ImmutableList.of(getOurIdentity().getOwningKey(), otherParty.getOwningKey());
         Command cmd = new Command<>(new IOUContract.Create(), requiredSigners);
 

docs/source/example-code/src/main/java/net/corda/docs/java/tutorial/twoparty/IOUFlowResponder.java

@@ -1,16 +1,16 @@
 package net.corda.docs.java.tutorial.twoparty;
 
 // DOCSTART 01
+// Add these imports:
 import co.paralleluniverse.fibers.Suspendable;
 import net.corda.core.contracts.ContractState;
 import net.corda.core.flows.*;
 import net.corda.core.transactions.SignedTransaction;
 import net.corda.core.utilities.ProgressTracker;
-import net.corda.docs.java.tutorial.helloworld.IOUFlow;
-import net.corda.docs.java.tutorial.helloworld.IOUState;
 
 import static net.corda.core.contracts.ContractsDSL.requireThat;
 
+// Define IOUFlowResponder:
 @InitiatedBy(IOUFlow.class)
 public class IOUFlowResponder extends FlowLogic<Void> {
     private final FlowSession otherPartySession;

docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/helloworld/flow.kt

@@ -1,16 +1,19 @@
 package net.corda.docs.tutorial.helloworld
 
-// DOCSTART 01
 import co.paralleluniverse.fibers.Suspendable
-import net.corda.core.contracts.Command
 import net.corda.core.flows.FinalityFlow
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.InitiatingFlow
 import net.corda.core.flows.StartableByRPC
+
+// DOCSTART 01
+// Add these imports:
+import net.corda.core.contracts.Command
 import net.corda.core.identity.Party
 import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.ProgressTracker
 
+// Replace TemplateFlow's definition with:
 @InitiatingFlow
 @StartableByRPC
 class IOUFlow(val iouValue: Int,

docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/helloworld/state.kt

@@ -1,9 +1,12 @@
 package net.corda.docs.tutorial.helloworld
 
-// DOCSTART 01
 import net.corda.core.contracts.ContractState
+
+// DOCSTART 01
+// Add these imports:
 import net.corda.core.identity.Party
 
+// Replace TemplateState's definition with:
 class IOUState(val value: Int,
                val lender: Party,
                val borrower: Party) : ContractState {

docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/twoparty/contract.kt

@@ -1,12 +1,16 @@
 package net.corda.docs.tutorial.twoparty
 
-// DOCSTART 01
 import net.corda.core.contracts.CommandData
 import net.corda.core.contracts.Contract
-import net.corda.core.contracts.requireSingleCommand
-import net.corda.core.contracts.requireThat
 import net.corda.core.transactions.LedgerTransaction
 
+// DOCSTART 01
+// Add these imports:
+import net.corda.core.contracts.*
+
+// Replace IOUContract's contract ID and definition with:
+val IOU_CONTRACT_ID = "com.template.IOUContract"
+
 class IOUContract : Contract {
     // Our Create command.
     class Create : CommandData
@@ -20,7 +24,7 @@ class IOUContract : Contract {
             "There should be one output state of type IOUState." using (tx.outputs.size == 1)
 
             // IOU-specific constraints.
-            val out = tx.outputsOfType<net.corda.docs.tutorial.helloworld.IOUState>().single()
+            val out = tx.outputsOfType<IOUState>().single()
             "The IOU's value must be non-negative." using (out.value > 0)
             "The lender and the borrower cannot be the same entity." using (out.lender != out.borrower)
 

docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/twoparty/flow.kt

@@ -6,9 +6,17 @@ import net.corda.core.contracts.Command
 import net.corda.core.contracts.StateAndContract
 import net.corda.core.flows.*
 import net.corda.core.identity.Party
+import net.corda.core.messaging.CordaRPCOps
+import net.corda.core.serialization.SerializationWhitelist
 import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.ProgressTracker
-import kotlin.reflect.jvm.jvmName
+import net.corda.webserver.services.WebServerPluginRegistry
+import java.util.function.Function
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+import javax.ws.rs.core.Response
 // DOCEND 01
 
 @InitiatingFlow
@@ -25,14 +33,13 @@ class IOUFlow(val iouValue: Int,
         // We retrieve the notary identity from the network map.
         val notary = serviceHub.networkMapCache.notaryIdentities[0]
 
-        // We create a transaction builder
+        // DOCSTART 02
+        // We create a transaction builder.
         val txBuilder = TransactionBuilder(notary = notary)
 
-        // DOCSTART 02
         // We create the transaction components.
         val outputState = IOUState(iouValue, ourIdentity, otherParty)
-        val outputContract = IOUContract::class.jvmName
-        val outputContractAndState = StateAndContract(outputState, outputContract)
+        val outputContractAndState = StateAndContract(outputState, IOU_CONTRACT_ID)
         val cmd = Command(IOUContract.Create(), listOf(ourIdentity.owningKey, otherParty.owningKey))
 
         // We add the items to the builder.

docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/twoparty/flowResponder.kt

@@ -1,16 +1,19 @@
 package net.corda.docs.tutorial.twoparty
 
-// DOCSTART 01
 import co.paralleluniverse.fibers.Suspendable
-import net.corda.core.contracts.requireThat
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.FlowSession
 import net.corda.core.flows.InitiatedBy
 import net.corda.core.flows.SignTransactionFlow
-import net.corda.core.transactions.SignedTransaction
 import net.corda.docs.tutorial.helloworld.IOUFlow
 import net.corda.docs.tutorial.helloworld.IOUState
 
+// DOCSTART 01
+// Add these imports:
+import net.corda.core.contracts.requireThat
+import net.corda.core.transactions.SignedTransaction
+
+// Define IOUFlowResponder:
 @InitiatedBy(IOUFlow::class)
 class IOUFlowResponder(val otherPartySession: FlowSession) : FlowLogic<Unit>() {
     @Suspendable