Incorporate Rosemary's sample edits from MR4241 and refactored image name in MII update3 sample use-case.

Author: ankedia

documentation/4.1/content/samples/domains/domain-home-on-pv/_index.md

@@ -20,7 +20,7 @@ For more information on Domain on PV, see the [Domain on PV]({{< relref "/managi
 
 #### Domain on PV domain types (WLS and JRF)
 
-Domain on PV is supported on two types of domains: a standard Oracle WebLogic Server (WLS) domain and an Oracle Fusion Middleware Infrastructure, Java Required Files (JRF) domain. This sample demonstrates both Oracle WebLogic Server (WLS) and JRF domain types.
+Domain on PV is supported on two types of domains: a standard Oracle WebLogic Server (WLS) domain and an Oracle Fusion Middleware Infrastructure, Java Required Files (JRF) domain. This sample demonstrates both WLS and JRF domain types.
 
 The JRF domain path through the sample includes additional steps required for JRF: deploying an infrastructure database, initializing the database using the Repository Creation Utility (RCU) tool, referencing the infrastructure database from the WebLogic configuration, setting an Oracle Platform Security Services (OPSS) wallet password, and exporting or importing an OPSS wallet file. JRF domains may be used by Oracle products that layer on top of WebLogic Server, such as SOA and OSB.
 

documentation/4.1/content/samples/domains/domain-home-on-pv/build-domain-creation-image.md

@@ -12,8 +12,12 @@ description: "Create WebLogic images using the WebLogic Image Tool and WebLogic
 ### Overview
 
 The image build process uses the WebLogic Image Tool to create a Domain on PV `domain creation image`.  This image contains:
-- A WebLogic Deploy Tooling installation (expected in an image's `/auxiliary/weblogic-deploy` directory by default).
-- WDT model YAML file (model), WDT variable (property), and WDT archive ZIP (archive) files (expected in directory `/auxiliary/models` by default).
+- A WebLogic Deploy Tooling installation, expected in an image's `/auxiliary/weblogic-deploy` directory by default.
+- WDT model YAML file (model), WDT variable (property), and WDT archive ZIP (archive) files, expected in directory `/auxiliary/models` by default,
+which can include the following file types:
+   - WDT model YAML file - A declarative definition of the domain configuration.
+   - WDT variable file - A property file that maps names to values. These names can be referenced from the model file to allow a model to be used across environments by applying the variable file for a particular environment to the model.
+   - WDT archive file - A ZIP file containing application binaries and other files and directories needed to run the domain.
 
 ### Build the domain creation image
 
@@ -126,9 +130,9 @@ The archive top directory, named `wlsdeploy`, contains a directory named `applic
 
 The application displays important details about the WebLogic Server instance that it's running on: namely its domain name, cluster name, and server name, as well as the names of any data sources that are targeted to the server. Also, you can see that application output reports that it's at version `v1`.
 
-#### Stage a ZIP file of the archive
+#### Stage the archive ZIP file
 
-When you create the image, you will use the files in the staging directory, `/tmp/sample/wdt-artifacts/wdt-model-files/WLS-v1`. In preparation, you need it to contain a WDT application archive (a ZIP) file.
+When you create the image, you will use the files in the staging directory, `/tmp/sample/wdt-artifacts/wdt-model-files/WLS-v1`. In preparation, you need it to contain a WDT application archive ZIP file.
 
 Run the following commands to create your application archive ZIP file and put it in the expected directory:
 

documentation/4.1/content/samples/domains/domain-home-on-pv/prerequisites.md

@@ -147,7 +147,7 @@ To do this, follow the same steps as the [Quick Start](https://oracle.github.io/
 
 ### Additional prerequisites for JRF domains
 
-**NOTE**: If you're using a Domain on PV WLS domain type, skip this section and continue on to [Build the domain creation image]({{< relref "/samples/domains/domain-home-on-pv/build-domain-creation-image.md" >}})
+**NOTE**: If you're using a Domain on PV, WLS domain type, skip this section and continue on to [Build the domain creation image]({{< relref "/samples/domains/domain-home-on-pv/build-domain-creation-image.md" >}})
 for the Domain on PV sample.
 
 #### JRF prerequisites

documentation/4.1/content/samples/domains/model-in-image/update3.md

@@ -29,7 +29,7 @@ Here are the steps for this use case:
 
 2. Create an updated auxiliary image.
 
-   Recall that a goal of the [Initial]({{< relref "/samples/domains/model-in-image/initial.md" >}}) use case was to demonstrate using the WebLogic Image Tool to create an auxiliary image named `model-in-image:WLS-AI-v1` from files that were staged in `/tmp/sample/model-images/model-in-image__WLS-AI-v1/`. The staged files included a web application in a WDT ZIP archive, and WDT model configuration for a WebLogic Server Administration Server called `admin-server` and a WebLogic cluster called `cluster-1`. The final image was called `model-in-image:WLS-AI-v1` and, in addition to having a copy of the staged files in its `/auxiliary/models` directory, also contained a WebLogic Deploy Tooling installation in its `/auxiliary/weblogic-deploy` directory.
+   Recall that a goal of the [Initial]({{< relref "/samples/domains/model-in-image/initial.md" >}}) use case was to demonstrate using the WebLogic Image Tool to create an auxiliary image named `wdt-domain-image:WLS-v1` from files that were staged in `/tmp/sample/model-images/model-in-image__WLS-AI-v1/`. The staged files included a web application in a WDT ZIP archive, and WDT model configuration for a WebLogic Server Administration Server called `admin-server` and a WebLogic cluster called `cluster-1`. The final image was called `wdt-domain-image:WLS-AI-v1` and, in addition to having a copy of the staged files in its `/auxiliary/models` directory, also contained a WebLogic Deploy Tooling installation in its `/auxiliary/weblogic-deploy` directory.
 
    In this use case, you will follow similar steps to the [Initial]({{< relref "/samples/domains/model-in-image/initial.md" >}}) use case to create a new image with an updated application and model, plus deploy the updated model and application to the running [Update 1]({{< relref "/samples/domains/model-in-image/update1.md" >}}) use case domain.
 
@@ -51,24 +51,24 @@ Here are the steps for this use case:
      # Delete existing archive.zip in case we have an old leftover version
      ```
      ```shell
-     $ rm -f /tmp/sample/model-images/model-in-image__WLS-AI-v2/archive.zip
+     $ rm -f /tmp/sample/wdt-artifacts/wdt-model-files/WLS-v2/archive.zip
      ```
      ```
      # Move to the directory which contains the source files for our new archive
      ```
      ```shell
-     $ cd /tmp/sample/archives/archive-v2
+     $ cd /tmp/sample/wdt-artifacts/archives/archive-v2
      ```
      ```
-     # Zip the archive to the location will later use when we run the WebLogic Image Tool
+     # Using the [WDT archive helper tool](#https://oracle.github.io/weblogic-deploy-tooling/userguide/tools/archive_helper/), create the archive in the location that we will use later when we run the WebLogic Image Tool.
      ```
      ```shell
-     $ zip -r /tmp/sample/model-images/model-in-image__WLS-AI-v2/archive.zip wlsdeploy
+     $ /tmp/sample/wdt-artifacts/weblogic-deploy/bin/archiveHelper.sh add application -archive_file=/tmp/sample/wdt-artifacts/wdt-model-files/WLS-v2/archive.zip -source=wlsdeploy/applications/myapp-v2
      ```
 
    - Understanding your staged model files.
 
-     The WDT model YAML file and properties for this use case have already been staged for you to directory `/tmp/sample/model-in-image__WLS-AI-v2`.
+     The WDT model YAML file and properties for this use case have already been staged for you to directory `/tmp/sample/wdt-artifacts/wdt-model-files/WLS-v2`.
 
      The `model.10.yaml` file in this directory has an updated path `wlsdeploy/applications/myapp-v2` that references the updated web application in your archive, but is otherwise identical to the model staged for the original image. The final related YAML file stanza looks like this:
 
@@ -85,25 +85,22 @@ Here are the steps for this use case:
 
    - Create a new auxiliary image from your staged model files using WIT.
 
-     At this point, you have staged all of the files needed for image `model-in-image:WLS-AI-v2`; they include:
+     At this point, you have staged all of the files needed for image `wdt-domain-image:WLS-v2`; they include:
 
-     - `/tmp/sample/model-images/weblogic-deploy.zip`
-     - `/tmp/sample/model-images/model-in-image__WLS-AI-v2/model.10.yaml`
-     - `/tmp/sample/model-images/model-in-image__WLS-AI-v2/model.10.properties`
-     - `/tmp/sample/model-images/model-in-image__WLS-AI-v2/archive.zip`
+     - `/tmp/sample/wdt-artifacts/wdt-model-files/WLS-v2/model.10.yaml`
+     - `/tmp/sample/wdt-artifacts/wdt-model-files/WLS-v2/model.10.properties`
+     - `/tmp/sample/model-images/wdt-artifacts/wdt-model-files/WLS-v2/archive.zip`
 
-     If you don't see the `weblogic-deploy.zip` file, then you missed a step in the [prerequisites]({{< relref "/samples/domains/model-in-image/prerequisites.md" >}}).
-
-     Now, you use the Image Tool to create an auxiliary image named `model-in-image:WLS-AI-v2`. You've already set up this tool during the prerequisite steps.
+     Now, you use the Image Tool to create an auxiliary image named `wdt-domain-image:WLS-v2`. You've already set up this tool during the prerequisite steps.
 
      Run the following commands to create the auxiliary image and verify that it worked:
 
      ```shell
-     $ cd /tmp/sample/model-images/model-in-image__WLS-AI-v2
+     $ cd /tmp/sample/wdt-artifacts/wdt-model-files/WLS-v2
      ```
      ```shell
-     $ /tmp/sample/model-images/imagetool/bin/imagetool.sh createAuxImage \
-       --tag model-in-image:WLS-AI-v2 \
+     $ /tmp/sample/wdt-artifacts/imagetool/bin/imagetool.sh createAuxImage \
+       --tag wdt-domain-image:WLS-v2 \
        --wdtModel ./model.10.yaml \
        --wdtVariables ./model.10.properties \
        --wdtArchive ./archive.zip
@@ -121,10 +118,10 @@ Here are the steps for this use case:
      When the command succeeds, it will end with output like the following:
 
      ```
-     [INFO   ] Build successful. Build time=36s. Image tag=model-in-image:WLS-AI-v2
+     [INFO   ] Build successful. Build time=36s. Image tag=wdt-domain-image:WLS-v2
      ```
 
-     Also, if you run the `docker images` command, then you will see an image named `model-in-image:WLS-AI-v2`.
+     Also, if you run the `docker images` command, then you will see an image named `wdt-domain-image:WLS-v2`.
 
      **NOTE**: Before you deploy the domain custom resource, ensure all nodes in your Kubernetes cluster [can access `auxiliary-image` and other images]({{< relref "/samples/domains/model-in-image/_index.md#ensuring-your-kubernetes-cluster-can-access-images" >}}).
 
@@ -140,15 +137,15 @@ Here are the steps for this use case:
 
        - Working on a copy is not strictly necessary, but it helps keep track of your work for the different use cases in this sample and provides you a backup of your previous work.
 
-     - Change the `/tmp/sample/mii-update3.yaml` Domain YAML file's `image` field to reference `model-in-image:WLS-AI-v2` instead of `model-in-image:WLS-AI-v1`.
+     - Change the `/tmp/sample/mii-update3.yaml` Domain YAML file's `image` field to reference `wdt-domain-image:WLS-v2` instead of `wdt-domain-image:WLS-v1`.
 
         The final result will look something like this:
 
         ```yaml
         ...
         spec:
           ...
-          image: "model-in-image:WLS-AI-v2"
+          image: "wdt-domain-image:WLS-v2"
         ```
 
       - Apply your changed Domain YAML file: