Merge pull request #256 from markcocker/dev

Add .zosattributes file to zospt tutorial

Author: markcocker

docs/pages/cdp/cdp-Deploying-your-first-nodejs-app.md

@@ -21,7 +21,7 @@ CICS TS V5.5 introduced support to run Node.js applications and is required by t
 
 3. Create a Node.js application using the [Express Application Generator](https://expressjs.com/en/starter/generator.html):
 
-   ```console
+   ```text
    npm install -g express-generator
    express myExpressApp
    cd myExpressApp
@@ -33,41 +33,59 @@ CICS TS V5.5 introduced support to run Node.js applications and is required by t
 
 4. Package the Node.js application into a [CICS bundle](cdp-cics-bundles).
 
-    Make sure that you are in the root directory of the application.
+   Make sure that you are in the root directory of the application.
 
-    Replace the value for `--port` with one that is available for use by the CICS region on z/OS. This sets the PORT environment variable in the generated `.profile` file. Additional variables can be set by editing this file.
+   Replace the value for `--port` with one that is available for use by the CICS region on z/OS. This sets the PORT environment variable in the generated `.profile` file. Additional variables can be set by editing this file.
 
    ```console
     zowe cics-deploy generate bundle --port 3000 --overwrite
    ```
 
-    The output indicates the directories and files that are created to form a CICS bundle. For example:
+   The output indicates the directories and files that are created to form a CICS bundle. For example:
 
-    <pre class="messageText">
-    define : NODEJSAPP "myexpressapp" with startscript "./bin/www"
-    create : nodejsapps
-    create : nodejsapps/myexpressapp.nodejsapp
-    create : nodejsapps/myexpressapp.profile
-    create : .zosattributes
-    create : META-INF
-    create : META-INF/cics.xml
-    CICS Bundle generated with bundleid "myexpressapp"</pre>
+   <pre class="messageText">
+   define : NODEJSAPP "myexpressapp" with startscript "./bin/www"
+   create : nodejsapps
+   create : nodejsapps/myexpressapp.nodejsapp
+   create : nodejsapps/myexpressapp.profile
+   create : .zosattributes
+   create : META-INF
+   create : META-INF/cics.xml
+   CICS Bundle generated with bundleid "myexpressapp"</pre>
 
 5. Deploy the CICS bundle into CICS.
 
-    ```console
-    zowe cics-deploy push bundle --name Express --overwrite
-    ```
+   ```text
+   zowe cics-deploy push bundle --name Express --overwrite
+   ```
+
+   A progress bar is shown with status messages as the CICS bundle is deployed and the application is started. This can take a few minutes. The command will summarize the deployment, including the Node.js runtime `.stdout` and `.stderr` file names that the application will write output to:
+
+   <pre class="messageText">
+   Regions in scope 'CICPY000' of CICSplex 'ZOSPTINT':
+   Applid: CICPY000   jobname: CICPY000   jobid: STC35860   sysname: MV2C
 
-    A progress bar is shown with status messages as the CICS bundle is deployed and the application is started. This can take a few minutes. If there are errors, retry with the `--verbose` option for more detailed output, or refer to [Troubleshooting](cdp-Troubleshooting-General).
+   NODEJSAPP resources for bundle 'Express' in scope 'CICPY000':
+   NODEJSAPP resource 'Express' is in 'ENABLED' state in region 'CICPY000' with process id '16844444'.
+   stdout: /u/cicprov/mnt/CICPY000/workdir/CICPY000/myexpressapp/Express/D20190612.T144609.stdout
+   stderr: /u/cicprov/mnt/CICPY000/workdir/CICPY000/myexpressapp/Express/D20190612.T144609.stderr
+   PUSH operation completed</pre>
 
-    This results in a CICS BUNDLE resource named `Express` being defined, installed, and enabled in CICS. If the BUNDLE `Express` was already defined or installed in CICS, it is undeployed first. As the BUNDLE is enabled, the Node.js application is started.
+   This results in a CICS BUNDLE resource named `Express` being defined, installed, and enabled in CICS. If the BUNDLE `Express` was already defined or installed in CICS, it is undeployed first. As the BUNDLE is enabled, the application is started. If there are errors, retry with the `--verbose` option for more detailed output, or refer to [Troubleshooting](cdp-Troubleshooting-General).
 
-6. Test the Node.js application.
+6. Test the application.
 
-    You can call the application from a browser by using URL [http://myzos:3000/](http://myzos:3000/), replacing _myzos_ with the host name of the z/OS system, and _3000_ with the port specified in step 4.
+   You can call the application from a browser by using URL [http://myzos:3000/](http://myzos:3000/), replacing _myzos_ with the host name of the z/OS system, and _3000_ with the port specified in step 4.
 
-    If you make changes to the application, you can redeploy it by repeating step 5.
+   If you make changes to the application, you can redeploy it by repeating step 5.
+
+7. View the application output files.
+
+   Use the [Zowe](https://marketplace.visualstudio.com/items?itemName=Zowe.vscode-extension-for-zowe) extension for Visual Studio Code or Zowe CLI commands to view the application output files. For example:
+
+   ```text
+   zowe zos-uss issue ssh "tail -f /u/cicprov/mnt/CICPY000/workdir/CICPY000/myexpressapp/Express/D20190612.T144609.stdout"
+   ```
 
 ### Results
 

docs/pages/cdp/cdp-Preparing-a-zOS-PT-image.md

@@ -30,7 +30,7 @@ Run the following commands on your workstation.
 
 3. Setup environment variables for the name of your image, and paths for the image source on the workstation and z/OS.
 
-   Update these value for to be suitable for your workstation and z/OS environments.
+   Update these values to be suitable for your workstation and z/OS environments.
 
    ```text
    export IMAGE="cics_55_nodejs"
@@ -66,15 +66,26 @@ Run the following commands on your workstation.
    | `ENV DFH_NODE_HOME=` | Installation directory for Node.js runtime provided by IBM SDK for Node.js - z/OS. |
    | `COPY bundles bundles` | Create an empty `bundles` directory in the provisioned file system to contain CICS bundles. |
 
-6. Upload the image source to z/OS.
+6. Create a `.zosattributes` file to upload zosptfile files as UTF-8.
+
+   This file is used by the `zowe zos-files upload dir-to-uss` command in the next step to exclude, convert, and tag files that are uploaded.
+
+   ```properties
+   cat <<EOF >> $IMAGE_DIR/.zosattributes
+   # Upload zosptfile files as UTF-8
+   zosptfile UTF-8 UTF-8
+   EOF
+   ```
+
+7. Upload the image source to z/OS.
 
    ```text
    zowe zos-uss issue ssh "rm -Rv *" --cwd "$IMAGE_DIR_ZOS"
    zowe zos-uss issue ssh "mkdir -p $IMAGE_DIR_ZOS"
    zowe zos-files upload dir-to-uss "$IMAGE_DIR" "$IMAGE_DIR_ZOS" --recursive
    ```
 
-7. Build the image source on z/OS.
+8. Build the image source on z/OS.
 
    ```text
    zowe zos-uss issue ssh "zospt build -t $IMAGE ." --cwd "$IMAGE_DIR_ZOS"
@@ -96,7 +107,7 @@ Run the following commands on your workstation.
 
 2. Create Zowe CLI profiles for at least z/OSMF and SSH following the steps in [Creating Zowe CLI profiles](cdp-Creating-Zowe-CLI-profiles).
 
-3. Prepare your environment and Node.js application by following steps 1 thru 4 in tutorial [Deploying your first Node.js app](cdp-Deploying-your-first-nodejs-app).
+3. Prepare your environment and Node.js application by following steps 1 to 4 in tutorial [Deploying your first Node.js app](cdp-Deploying-your-first-nodejs-app).
 
 4. Setup environment variables for the name of your image, and paths for the image source on the workstation and z/OS.