fixes from release testing (#1284)

* Updates for work * Adding Installing Index to ToC * Removing Fabric Composer name * Removing Fabric composer name * Moving images for REST API doc * Fabric Composer Name removal * Fabric Composer name removal * Other name changes (Stack Overflow, GitHub, Rocket.Chat, JavaScript) * wording updates and bug splats * ToC Updates * HLv1 docs updates, couple more bug splats. * Last edit for HLv1 * Whoops, bug splat * Another bug splat... * Quick fixes prereqs navbar * intro diagram fix and bug fixes * Fixes and updates * Rollback optional script for v1.0 * QoL changes and rollback changes - Quickstart * Link fixes * Atom links fix, formatting fix * Odd formatting fix. * Name change and codeblock fix * More odd formatting fixes * Ubuntu root user doc fix + draft of bnd doc changes * update for CLI define + deploy BNA * last bnd update * Events and bug fixes * Last event thing * Updates for #803 and #822 * removing unnecessary stuff * Undeploy support #673 * Clarifications on undeploy * Commit? * Revert "Commit?" This reverts commit 9094568. * Quick Fixes * Quick fix for connection profile keyvalstore * Updates to show events docs in ToC * Quick fixes * Last minute docs updates. * changes from issue #912 Signed-off-by: Edward Prosser <[email protected]> * Version 1 auto-generating landing pages * Docs Updates week 2 * 1 more set of updates * last changes * HLFV1 Beta and Query (#1247) (#1255) System and unit tests Rich query support for fabric V1 alpha Alpha 2 Support * Move HLF v0.6 to use Duktape instead of Otto (#1257) * Connection profile, identity import, logic.js * Query v0.1 * Connection profile, Query, Security, Dev Guide * Security updates for local playground * Last minute updates * Release test fixes * Image fix
hyperledger-archives · Jun 15, 2017 · a925408 · a925408
1 parent c1ccdb4
commit a925408
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 17 deletions.
diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/businessnetworks.md b/packages/composer-website/jekylldocs/_includes/sidebars/businessnetworks.md
@@ -8,6 +8,7 @@
 [Emitting events](../business-network/publishing-events.html)
 [Testing](../business-network/testing.html)
 [Publishing to npm](../business-network/bnd-publish.html)
+[Querying Assets](../business-network/query.html)
 **[Developing Applications](../applications/applications-index.html)**
 **[Integrating Existing Systems](../integrating/integrating-index.html)**
 **[Managing and Operating](../managing/managingindex.html)**

diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/integrating.md b/packages/composer-website/jekylldocs/_includes/sidebars/integrating.md
@@ -8,6 +8,7 @@
 [Enabling REST API authentication for a business network](../integrating/enabling-rest-authentication.html)
 [Deploying the REST server for a business network](../integrating/deploying-the-rest-server.html)
 [Calling external REST services](../integrating/call-out.html)
+[Integrating using Node-RED](../integrating/node-red.html)
 **[Managing and Operating](../managing/managingindex.html)**
 **[Diagnosing Problems](../problems/diagnostics.html)**
 **[Reference](../reference/MeetTheModules.html)**

diff --git a/packages/composer-website/jekylldocs/assets/img/ComposerArchitecture.svg b/packages/composer-website/jekylldocs/assets/img/ComposerArchitecture.svg
diff --git a/packages/composer-website/jekylldocs/business-network/query.md b/packages/composer-website/jekylldocs/business-network/query.md
@@ -34,6 +34,7 @@ The JS Object returned is composed of an array of objects, each with a `Key` and
 ### Example
 
 The example below runs a content-based query to select all `SMALL` marbles, verifies the number of marbles returned, and that they are indeed all `SMALL`.
+
 ```
 /**
  * Executes a CouchDB query and checks the results.

diff --git a/packages/composer-website/jekylldocs/integrating/node-red.md b/packages/composer-website/jekylldocs/integrating/node-red.md
@@ -0,0 +1,23 @@
+---
+layout: default
+title: Integrating with Node-RED
+category: integrating
+section: integrating
+sidebar: sidebars/integrating.md
+excerpt: Deploying the REST server for a business network
+---
+
+# Integrating with Node-RED
+
+[Node-RED](http://nodered.org) is a lightweight Open Source integration technology, written in JavaScript. It uses a graphical flow to integrate different _nodes_, where nodes can receive data, transform data and output data.
+
+Node-RED is commonly used to rapidly prototype Internet of Things style applications, or to wire existing Internet services together.
+You can use the {{site.data.conrefs.composer_full}} Node-RED contribution to:
+- Submit transactions
+- Read and update assets and participants
+- Subscribe to events
+
+_Note: delete operations on assets and participants are not yet supported._
+
+The {{site.data.conrefs.composer_full}} Node-RED nodes are distributed as a standalone npm package, published here:
+- https://www.npmjs.com/package/node-red-contrib-hyperledger-composer
diff --git a/packages/composer-website/jekylldocs/introduction/solution-architecture.md b/packages/composer-website/jekylldocs/introduction/solution-architecture.md
@@ -31,7 +31,7 @@ excerpt:
 {{site.data.conrefs.composer_full}} has been designed to support different pluggable runtimes, and currently has four runtime implementations:
 
 * {{site.data.conrefs.hlf_full}} version 0.6. State is stored on the distributed ledger.
-* {{site.data.conrefs.hlf_full}} version 1.0 alpha1. State is stored on the distributed ledger.
+* {{site.data.conrefs.hlf_full}} version 1.0 beta. State is stored on the distributed ledger.
 * Web, which executes within a web page, and is used by Playground. State is stored in browser local storage.
 * Embedded, which executes within a Node.js process, and is used primarily for unit testing business logic. State is stored in an in-memory key-value store.
 

diff --git a/packages/composer-website/jekylldocs/reference/composer.identity.import.md b/packages/composer-website/jekylldocs/reference/composer.identity.import.md
@@ -19,7 +19,7 @@ All the options are required. The `userId` doesn't have to match any information
 ## Syntax example
 
 ```
-node cli.js identity import -p hlfv1 -u PeerAdmin -c ./peerOrganizations/org1.example.com/users/[email protected]/signcerts/[email protected] -k ./peerOrganizations/org1.example.com/users/[email protected]/keystore/9022d671ceedbb24af3ea69b5a8136cc64203df6b9920e26f48123fcfcb1d2e9_sk
+composer identity import -p hlfv1 -u PeerAdmin -c ./peerOrganizations/org1.example.com/users/[email protected]/signcerts/[email protected] -k ./peerOrganizations/org1.example.com/users/[email protected]/keystore/9022d671ceedbb24af3ea69b5a8136cc64203df6b9920e26f48123fcfcb1d2e9_sk
 ```
 
 ## Options

diff --git a/packages/composer-website/jekylldocs/tutorials/developer-guide.md b/packages/composer-website/jekylldocs/tutorials/developer-guide.md
@@ -101,7 +101,7 @@ As an example, we're going to replace the entire contents of the file 'sample.ct
 /**
  * My commodity trading network
  */
-namespace org.example.mynetwork
+namespace org.acme.mynetwork
 asset Commodity identified by tradingSymbol {
     o String tradingSymbol
     o String description
@@ -151,12 +151,12 @@ Now replace the entire contents of `sample.js` with the function below (includin
 
 /**
  * Track the trade of a commodity from one trader to another
- * @param {org.example.mynetwork.Trade} trade - the trade to be processed
+ * @param {org.acme.mynetwork.Trade} trade - the trade to be processed
  * @transaction
  */
 function tradeCommodity(trade) {
     trade.commodity.owner = trade.newOwner;
-    return getAssetRegistry('org.example.mynetwork.Commodity')
+    return getAssetRegistry('org.acme.mynetwork.Commodity')
         .then(function (assetRegistry) {
             return assetRegistry.update(trade.commodity);
         });
@@ -179,7 +179,7 @@ rule Default {
     description: "Allow all participants access to all resources"
     participant: "ANY"
     operation: ALL
-    resource: "org.example.mynetwork"
+    resource: "org.acme.mynetwork"
     action: ALLOW
 }
 ```
@@ -257,7 +257,7 @@ const path = require('path');
 require('chai').should();
 
 const bfs_fs = BrowserFS.BFSRequire('fs');
-const NS = 'org.example.mynetwork';
+const NS = 'org.acme.mynetwork';
 
 describe('Commodity Trading', () => {
 
@@ -418,7 +418,7 @@ Next, navigate to the "Test" tab at the top and create two 'Trader' participants
 
 ```
 {
-  "$class": "org.example.mynetwork.Trader",
+  "$class": "org.acme.mynetwork.Trader",
   "tradeId": "TRADER1",
   "firstName": "Jenny",
   "lastName": "Jones"
@@ -427,7 +427,7 @@ Next, navigate to the "Test" tab at the top and create two 'Trader' participants
 
 ```
 {
-  "$class": "org.example.mynetwork.Trader",
+  "$class": "org.acme.mynetwork.Trader",
   "tradeId": "TRADER2",
   "firstName": "Amy",
   "lastName": "Williams"
@@ -442,12 +442,12 @@ Create a new instance of a Commodity (asset) by navigating to the Commodity regi
 
 ```
 {
-  "$class": "org.example.mynetwork.Commodity",
+  "$class": "org.acme.mynetwork.Commodity",
   "tradingSymbol": "ABC",
   "description": "Test commodity",
   "mainExchange": "Euronext",
   "quantity": 72.297,
-  "owner": "resource:org.example.mynetwork.Trader#TRADER1"
+  "owner": "resource:org.acme.mynetwork.Trader#TRADER1"
 }
 ```
 
@@ -459,9 +459,9 @@ Next, submit a `Trade` transaction by clicking the "Submit Transaction" button,
 
 ```
 {
-  "$class": "org.example.mynetwork.Trade",
-  "commodity": "resource:org.example.mynetwork.Commodity#ABC",
-  "newOwner": "resource:org.example.mynetwork.Trader#TRADER2"
+  "$class": "org.acme.mynetwork.Trade",
+  "commodity": "resource:org.acme.mynetwork.Commodity#ABC",
+  "newOwner": "resource:org.acme.mynetwork.Trader#TRADER2"
 }
 ```
 
@@ -483,7 +483,7 @@ Switch to the terminal, change directory to the `dist` folder containing the `my
 
 ```
 cd dist
-composer network deploy -a my-network.bna -p hlfv1 -i admin -s adminpw
+composer network deploy -a my-network.bna -p hlfv1 -i PeerAdmin -s randomString
 ```
 
 
@@ -565,7 +565,7 @@ First, use the `POST` method on Trader to create a new instance of a Trader - fi
 
 ```
 {
-  "$class": "org.example.mynetwork.Trader",
+  "$class": "org.acme.mynetwork.Trader",
   "tradeId": "TRADER1",
   "firstName": "Jenny",
   "lastName": "Jones"