From d6773d502cd193331f8e64a848a37167b176997c Mon Sep 17 00:00:00 2001
From: Julian Castrence <juliancastrence@ibm.com>
Date: Wed, 2 Dec 2020 13:46:37 -0500
Subject: [PATCH] Remove Short Names and Replace With Full Path in Samples

Signed-off-by: Julian Castrence <juliancastrence@ibm.com>
---
 asset-transfer-basic/application-javascript/app.js            | 2 +-
 asset-transfer-basic/application-typescript/src/app.ts        | 2 +-
 asset-transfer-events/application-javascript/app.js           | 2 +-
 asset-transfer-ledger-queries/application-javascript/app.js   | 2 +-
 .../hyperledger/fabric/samples/privatedata/AssetTransfer.java | 2 +-
 asset-transfer-sbe/README.md                                  | 2 +-
 asset-transfer-sbe/application-javascript/app.js              | 2 +-
 .../application-javascript/app.js                             | 2 +-
 test-network/scriptUtils.sh                                   | 4 ++--
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/asset-transfer-basic/application-javascript/app.js b/asset-transfer-basic/application-javascript/app.js
index 28311489..7f368c61 100644
--- a/asset-transfer-basic/application-javascript/app.js
+++ b/asset-transfer-basic/application-javascript/app.js
@@ -32,7 +32,7 @@ function prettyJSONString(inputString) {
 //   install, approve, and commit the javascript chaincode, all the actions it takes
 //   to deploy a chaincode to a channel.
 //         ===> from directory /fabric-samples/test-network
-//         ./network.sh deployCC -ccn basic -ccl javascript
+//         ./network.sh deployCC -ccn basic -ccp ../asset-transfer-basic/chaincode-javascript/ -ccl javascript
 // - Be sure that node.js is installed
 //         ===> from directory /fabric-samples/asset-transfer-basic/application-javascript
 //         node -v
diff --git a/asset-transfer-basic/application-typescript/src/app.ts b/asset-transfer-basic/application-typescript/src/app.ts
index cd73a346..075e0eda 100644
--- a/asset-transfer-basic/application-typescript/src/app.ts
+++ b/asset-transfer-basic/application-typescript/src/app.ts
@@ -24,7 +24,7 @@ const org1UserId = 'appUser';
 //   install, approve, and commit the javascript chaincode, all the actions it takes
 //   to deploy a chaincode to a channel.
 //         ===> from directory /fabric-samples/test-network
-//         ./network.sh deployCC -ccn basic -ccl javascript
+//         ./network.sh deployCC -ccn basic -ccp ../asset-transfer-basic/chaincode-typescript/ -ccl javascript
 // - Be sure that node.js is installed
 //         ===> from directory /fabric-samples/asset-transfer-basic/application-typescript
 //         node -v
diff --git a/asset-transfer-events/application-javascript/app.js b/asset-transfer-events/application-javascript/app.js
index 6ff641ac..4a8a1c2f 100644
--- a/asset-transfer-events/application-javascript/app.js
+++ b/asset-transfer-events/application-javascript/app.js
@@ -44,7 +44,7 @@
 //   approve, and commit the javascript chaincode, all the actions it takes
 //   to deploy a chaincode to a channel.
 //         ===> from directory test-network
-//         ./network.sh deployCC -ccn events -ccl javascript -ccep "OR('Org1MSP.peer','Org2MSP.peer')"
+//         ./network.sh deployCC -ccn events -ccp ../asset-transfer-events/chaincode-javacript/ -ccl javascript -ccep "OR('Org1MSP.peer','Org2MSP.peer')"
 //
 // - Be sure that node.js is installed
 //         ===> from directory asset-transfer-sbe/application-javascript
diff --git a/asset-transfer-ledger-queries/application-javascript/app.js b/asset-transfer-ledger-queries/application-javascript/app.js
index 75fe3045..8047f55e 100644
--- a/asset-transfer-ledger-queries/application-javascript/app.js
+++ b/asset-transfer-ledger-queries/application-javascript/app.js
@@ -33,7 +33,7 @@ function prettyJSONString(inputString) {
 //   install, approve, and commit the javascript chaincode, all the actions it takes
 //   to deploy a chaincode to a channel.
 //         ===> from directory /fabric-samples/test-network
-//         ./network.sh deployCC -ccn ledger -ccl javascript
+//         ./network.sh deployCC -ccn ledger -ccp ../asset-transfer-ledger-queries/chaincode-javascript/ -ccl javascript
 // - Be sure that node.js is installed
 //         ===> from directory /fabric-samples/asset-transfer-ledger-queries/application-javascript
 //         node -v
diff --git a/asset-transfer-private-data/chaincode-java/src/main/java/org/hyperledger/fabric/samples/privatedata/AssetTransfer.java b/asset-transfer-private-data/chaincode-java/src/main/java/org/hyperledger/fabric/samples/privatedata/AssetTransfer.java
index c8c569f8..f95a234d 100644
--- a/asset-transfer-private-data/chaincode-java/src/main/java/org/hyperledger/fabric/samples/privatedata/AssetTransfer.java
+++ b/asset-transfer-private-data/chaincode-java/src/main/java/org/hyperledger/fabric/samples/privatedata/AssetTransfer.java
@@ -42,7 +42,7 @@ import java.util.Map;
  * To deploy this chaincode to test-network, use the collection config as described in
  * See <a href="https://hyperledger-fabric.readthedocs.io/en/latest/private_data_tutorial.html</a>
  * Change both -ccs sequence & -ccv version args for iterative deployment
- *  ./network.sh deployCC -ccn private -ccl java -ccep "OR('Org1MSP.peer','Org2MSP.peer')" -cccg ../asset-transfer-private-data/chaincode-go/collections_config.json -ccs 1 -ccv 1
+ *  ./network.sh deployCC -ccn private -ccp ../asset-transfer-private-data/chaincode-java/ -ccl java -ccep "OR('Org1MSP.peer','Org2MSP.peer')" -cccg ../asset-transfer-private-data/chaincode-go/collections_config.json -ccs 1 -ccv 1
  */
 @Contract(
         name = "private",
diff --git a/asset-transfer-sbe/README.md b/asset-transfer-sbe/README.md
index d4b1cad1..00549bb1 100644
--- a/asset-transfer-sbe/README.md
+++ b/asset-transfer-sbe/README.md
@@ -64,7 +64,7 @@ Run the following command to deploy the test network and create a channel named
 
 You can use the test network script to deploy the smart contract to the channel that was just created. The script uses the Fabric chaincode lifecycle to deploy the smart contract to the channel. We will use the default chaincode level endorsement policy used by the Fabric chaincode lifecycle, which requires an endorsement from a majority of channel members. In our case, this will require that both Org1 and Org2 endorse a transaction (2 of 2). Deploy the smart contract to `mychannel` using the following command:
 ```
-./network.sh deployCC -ccn sbe -ccl typescript
+./network.sh deployCC -ccn sbe -ccp ../asset-transfer-sbe/chaincode-typescript/ -ccl typescript
 ```
 
 Set the following environment variables to interact with the network as a user from Org1:
diff --git a/asset-transfer-sbe/application-javascript/app.js b/asset-transfer-sbe/application-javascript/app.js
index 5f7ef296..47adcca5 100644
--- a/asset-transfer-sbe/application-javascript/app.js
+++ b/asset-transfer-sbe/application-javascript/app.js
@@ -27,7 +27,7 @@
 //   install, approve, and commit the javascript chaincode, all the actions it takes
 //   to deploy a chaincode to a channel.
 //         ===> from directory /fabric-samples/test-network
-//         ./network.sh deployCC -ccn sbe -ccl typescript
+//         ./network.sh deployCC -ccn sbe -ccp ../asset-transfer-sbe/chaincode-typescript/ -ccl typescript
 // - Be sure that node.js is installed
 //         ===> from directory /fabric-samples/asset-transfer-sbe/application-javascript
 //         node -v
diff --git a/asset-transfer-secured-agreement/application-javascript/app.js b/asset-transfer-secured-agreement/application-javascript/app.js
index 3bc178f5..348be2bc 100644
--- a/asset-transfer-secured-agreement/application-javascript/app.js
+++ b/asset-transfer-secured-agreement/application-javascript/app.js
@@ -29,7 +29,7 @@
 //   to deploy a chaincode to a channel with the endorsement and private collection
 //   settings.
 //         ===> from directory /fabric-samples/test-network
-//         ./network.sh deployCC -ccn secured -ccl go -ccep "OR('Org1MSP.peer','Org2MSP.peer')"
+//         ./network.sh deployCC -ccn secured -ccp ../asset-transfer-secured-agreement/chaincode-go/ -ccl go -ccep "OR('Org1MSP.peer','Org2MSP.peer')"
 //
 // - Be sure that node.js is installed
 //         ===> from directory /fabric-samples/asset-transfer-sbe/application-javascript
diff --git a/test-network/scriptUtils.sh b/test-network/scriptUtils.sh
index 043d33f0..f948c3ff 100755
--- a/test-network/scriptUtils.sh
+++ b/test-network/scriptUtils.sh
@@ -69,7 +69,7 @@ function printHelp() {
     println "   \033[0;32mdeployCC\033[0m -ccn -ccl -ccv -ccs -ccp -cci -r -d -verbose"
     println
     println " Examples:"
-    println "   network.sh deployCC -ccn basic -ccl javascript"
+    println "   network.sh deployCC -ccn basic -ccp ../asset-transfer-basic/chaincode-javascript/ ./ -ccl javascript"
     println "   network.sh deployCC -ccn mychaincode -ccp ./user/mychaincode -ccv 1 -ccl javascript"
   else
     println "Usage: "
@@ -114,7 +114,7 @@ function printHelp() {
     println " Examples:"
     println "   network.sh up createChannel -ca -c mychannel -s couchdb -i 2.0.0"
     println "   network.sh createChannel -c channelName"
-    println "   network.sh deployCC -ccn basic -ccl javascript"
+    println "   network.sh deployCC -ccn basic -ccp ../asset-transfer-basic/chaincode-javascript/ -ccl javascript"
     println "   network.sh deployCC -ccn mychaincode -ccp ./user/mychaincode -ccv 1 -ccl javascript"
   fi
 }