From 445ccbc25ab541280be2844b12077a4682243439 Mon Sep 17 00:00:00 2001
From: Simon Stone <sstone1@uk.ibm.com>
Date: Mon, 10 Dec 2018 16:53:22 +0000
Subject: [PATCH] [FAB-12880] Move old prog model samples for FabCar

Move the old programming model samples for FabCar,
including the "node" (JavaScript!) chaincode sample
and the JavaScript application in the top level into
new subdirectories called "javascript-low-level".

We still want to keep these samples around for comparision
purposes, but most new developers should be using the new
samples built using the new programming model.

At the same time, update the startFabric.sh script
to output correct help information on how to run
the applications built using the new programming model
after starting the Fabric network and deploying the chaincode.

Change-Id: I1e3701737f105cba67f661bf893771ac8a3a0373
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
---
 .../{node => javascript-low-level}/fabcar.js  |  0
 .../package.json                              |  0
 .../{ => javascript-low-level}/enrollAdmin.js |  0
 fabcar/{ => javascript-low-level}/invoke.js   |  0
 .../{ => javascript-low-level}/package.json   |  0
 fabcar/{ => javascript-low-level}/query.js    |  0
 .../registerUser.js                           |  0
 fabcar/startFabric.sh                         | 61 +++++++++++++++++--
 8 files changed, 56 insertions(+), 5 deletions(-)
 rename chaincode/fabcar/{node => javascript-low-level}/fabcar.js (100%)
 rename chaincode/fabcar/{node => javascript-low-level}/package.json (100%)
 rename fabcar/{ => javascript-low-level}/enrollAdmin.js (100%)
 rename fabcar/{ => javascript-low-level}/invoke.js (100%)
 rename fabcar/{ => javascript-low-level}/package.json (100%)
 rename fabcar/{ => javascript-low-level}/query.js (100%)
 rename fabcar/{ => javascript-low-level}/registerUser.js (100%)

diff --git a/chaincode/fabcar/node/fabcar.js b/chaincode/fabcar/javascript-low-level/fabcar.js
similarity index 100%
rename from chaincode/fabcar/node/fabcar.js
rename to chaincode/fabcar/javascript-low-level/fabcar.js
diff --git a/chaincode/fabcar/node/package.json b/chaincode/fabcar/javascript-low-level/package.json
similarity index 100%
rename from chaincode/fabcar/node/package.json
rename to chaincode/fabcar/javascript-low-level/package.json
diff --git a/fabcar/enrollAdmin.js b/fabcar/javascript-low-level/enrollAdmin.js
similarity index 100%
rename from fabcar/enrollAdmin.js
rename to fabcar/javascript-low-level/enrollAdmin.js
diff --git a/fabcar/invoke.js b/fabcar/javascript-low-level/invoke.js
similarity index 100%
rename from fabcar/invoke.js
rename to fabcar/javascript-low-level/invoke.js
diff --git a/fabcar/package.json b/fabcar/javascript-low-level/package.json
similarity index 100%
rename from fabcar/package.json
rename to fabcar/javascript-low-level/package.json
diff --git a/fabcar/query.js b/fabcar/javascript-low-level/query.js
similarity index 100%
rename from fabcar/query.js
rename to fabcar/javascript-low-level/query.js
diff --git a/fabcar/registerUser.js b/fabcar/javascript-low-level/registerUser.js
similarity index 100%
rename from fabcar/registerUser.js
rename to fabcar/javascript-low-level/registerUser.js
diff --git a/fabcar/startFabric.sh b/fabcar/startFabric.sh
index d652d7a7d2..7a2fcaee47 100755
--- a/fabcar/startFabric.sh
+++ b/fabcar/startFabric.sh
@@ -50,8 +50,59 @@ docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/g
 sleep 10
 docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli peer chaincode invoke -o orderer.example.com:7050 -C mychannel -n fabcar -c '{"function":"initLedger","Args":[]}'
 
-printf "\nTotal setup execution time : $(($(date +%s) - starttime)) secs ...\n\n\n"
-printf "Start by installing required packages run 'npm install'\n"
-printf "Then run 'node enrollAdmin.js', then 'node registerUser'\n\n"
-printf "The 'node invoke.js' will fail until it has been updated with valid arguments\n"
-printf "The 'node query.js' may be run at anytime once the user has been registered\n\n"
+cat <<EOF
+
+Total setup execution time : $(($(date +%s) - starttime)) secs ...
+
+Next, use the FabCar applications to interact with the deployed FabCar contract.
+The FabCar applications are available in multiple programming languages.
+Follow the instructions for the programming language of your choice:
+
+JavaScript:
+
+  Start by changing into the "javascript" directory:
+    cd javascript
+
+  Next, install all required packages:
+    npm install
+
+  Then run the following applications to enroll the admin user, and register a new user
+  called user1 which will be used by the other applications to interact with the deployed
+  FabCar contract:
+    node enrollAdmin
+    node registerUser
+
+  You can run the invoke application as follows. By default, the invoke application will
+  create a new car, but you can update the application to submit other transactions:
+    node invoke
+
+  You can run the query application as follows. By default, the query application will
+  return all cars, but you can update the application to evaluate other transactions:
+    node query
+
+TypeScript:
+
+  Start by changing into the "typescript" directory:
+    cd typescript
+
+  Next, install all required packages:
+    npm install
+
+  Next, compile the TypeScript code into JavaScript:
+    npm run build
+
+  Then run the following applications to enroll the admin user, and register a new user
+  called user1 which will be used by the other applications to interact with the deployed
+  FabCar contract:
+    node dist/enrollAdmin
+    node dist/registerUser
+
+  You can run the invoke application as follows. By default, the invoke application will
+  create a new car, but you can update the application to submit other transactions:
+    node dist/invoke
+
+  You can run the query application as follows. By default, the query application will
+  return all cars, but you can update the application to evaluate other transactions:
+    node dist/query
+
+EOF