Merge branch 're-document-ohs' into 'main'

Restore documentation for OHS image type, and remove OHS_DB19 image type.

See merge request weblogic-cloud/weblogic-image-tool!488

documentation/site/content/_index.md

@@ -55,16 +55,17 @@ Use WebLogic Image Tool to create, update, and rebase the following FMW product
 
 * Oracle WebLogic Server (WLS)
 * Fusion Middleware Infrastructure (FMW)
-* Oracle BPM Suite for business process (SOA)
-* Oracle Service Bus (OSB)
-* Oracle Data Integrator (ODI)
+* Oracle Identity Manager (IDM)
+* Oracle Managed File Transfer (MFT)
 * Oracle Access Management (OAM)
+* Oracle Data Integrator (ODI)
+* Oracle HTTP Server (OHS)
+* Oracle Internet Directory (OID)
 * Oracle Identity Governance (OIG)
+* Oracle Service Bus (OSB)
 * Oracle Unified Directory (OUD)
+* Oracle SOA Suite (SOA)
 * Universal Content Management (UCM)
-* Oracle Managed File Transfer (MFT)
-* Oracle Internet Directory (OID)
-* Oracle WebCenter Sites (WCS)
-* Oracle Identity Manager (IDM)
 * Oracle WebCenter Content (WCC)
 * Oracle WebCenter Portal (WCP)
+* Oracle WebCenter Sites (WCS)

documentation/site/content/userguide/tools/create-image.md

@@ -47,7 +47,7 @@ Usage: imagetool create [OPTIONS]
 | `--skipcleanup` | Do not delete the build context folder, intermediate images, and failed build containers. For debugging purposes.  |   |
 | `--strictPatchOrdering` |  Instruct OPatch to apply patches one at a time (uses `apply` instead of `napply`). |   |
 | `--target` | Select the target environment in which the created image will be used. Supported values: `Default` (Docker/Kubernetes), `OpenShift`. See [Additional information](#--target). | `Default`  |
-| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `OSB`, `OUD_WLS`, `SOA_OSB`, `SOA_OSB_B2B`, `MFT`, `WCP`, `OAM`, `OIG`, `OUD`, `OID`, `ODI`, `SOA`, `WCC`, `WCS`, `WCP`  | `WLS`  |
+| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `MFT`, `OAM`, `ODI`, `OHS`, `OIG`, `OUD`, `OUD_WLS`, `OID`, `OSB`, `SOA`, `SOA_OSB`, `SOA_OSB_B2B`, `WCC`, `WCP`, `WCS`  | `WLS`  |
 | `--user` | Oracle support email ID. When supplying `user`, you must supply the password either as an environment variable using `--passwordEnv`, or as a file using `--passwordFile`, or interactively, on the command line with `--password`.  |   |
 | `--version` | Installer version. | `12.2.1.3.0`  |
 | `--wdtArchive` | A WDT archive ZIP file or comma-separated list of files.  |   |

documentation/site/content/userguide/tools/rebase-image.md

@@ -46,7 +46,7 @@ Usage: imagetool rebase [OPTIONS]
 | `--strictPatchOrdering` |  Instruct OPatch to apply patches one at a time (uses `apply` instead of `napply`). |   |
 | `--target` | Select the target environment in which the created image will be used. Supported values: `Default` (Docker/Kubernetes), `OpenShift`. See [Additional information](#--target). | `Default`  |
 | `--targetImage` | Container image to extend for the domain's new image. |   |
-| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `OSB`, `OUD_WLS`, `SOA_OSB`, `SOA_OSB_B2B`, `MFT`, `WCP`, `OAM`, `OIG`, `OUD`, `OID`, `ODI`, `SOA`, `WCC`, `WCS`, `WCP`  | `WLS`  |
+| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `MFT`, `OAM`, `ODI`, `OHS`, `OIG`, `OUD`, `OUD_WLS`, `OID`, `OSB`, `SOA`, `SOA_OSB`, `SOA_OSB_B2B`, `WCC`, `WCP`, `WCS`  | `WLS`  |
 | `--user` | Your Oracle support email ID. When supplying `user`, you must supply the password either as an environment variable using `--passwordEnv`, or as a file using `--passwordFile`, or interactively, on the command line with `--password`. |   |
 | `--version` | Installer version. | `12.2.1.3.0`  |
 

documentation/site/content/userguide/tools/update-image.md

@@ -48,7 +48,7 @@ Update WebLogic Docker image with selected patches
 | `--skipcleanup` | Do not delete the build context folder, intermediate images, and failed build containers. For debugging purposes. |  |
 | `--strictPatchOrdering` | Instruct OPatch to apply patches one at a time (uses `apply` instead of `napply`). |  |
 | `--target` | Select the target environment in which the created image will be used. Supported values: `Default` (Docker/Kubernetes), `OpenShift`. See [Additional information](#--target). | `Default` |
-| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `OSB`, `OUD_WLS`, `SOA_OSB`, `SOA_OSB_B2B`, `MFT`, `WCP`, `OAM`, `OIG`, `OUD`, `OID`, `ODI`, `SOA`, `WCC`, `WCS`, `WCP`  | `WLS`  |
+| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `MFT`, `OAM`, `ODI`, `OHS`, `OIG`, `OUD`, `OUD_WLS`, `OID`, `OSB`, `SOA`, `SOA_OSB`, `SOA_OSB_B2B`, `WCC`, `WCP`, `WCS`  | `WLS`  |
 | `--user` | Oracle support email ID. When supplying `user`, you must supply the password either as an environment variable using `--passwordEnv`, or as a file using `--passwordFile`, or interactively, on the command line with `--password`. |  |
 | `--wdtArchive` | A WDT archive ZIP file or comma-separated list of files. |  |
 | `--wdtDomainHome` | Path to the `-domain_home` for WDT. | `/u01/domains/base_domain`    |

imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruUtil.java

@@ -215,7 +215,7 @@ List<AruPatch> getRecommendedPatches(FmwInstallerType type, AruProduct product,
                 // Get a list of patches applicable to the given product and release number
                 patches = getReleaseRecommendations(product, releaseNumber, architecture, userId, password);
                 logger.fine("Search for {0} recommended patches returned {1}", product, patches.size());
-                if (type == FmwInstallerType.OHS_DB19 || type == FmwInstallerType.OHS) {
+                if (type == FmwInstallerType.OHS) {
                     // Workaround for the Apache Plugin patch currently uploaded as an OHS patch.
                     patches = patches.stream().filter(p ->
                         !p.description().contains("APACHE PLUGIN")).collect(Collectors.toList());

imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/FmwInstallerType.java

@@ -82,9 +82,6 @@ public enum FmwInstallerType {
     OHS(Utils.toSet(AruProduct.OHS, AruProduct.OAM_WG, AruProduct.WLS, AruProduct.JDBC, AruProduct.FMWPLAT,
         AruProduct.OSS, AruProduct.FIT),
         InstallerType.OHS, InstallerType.DB19),
-    OHS_DB19(Utils.toSet(AruProduct.OHS, AruProduct.OAM_WG, AruProduct.WLS, AruProduct.JDBC, AruProduct.FMWPLAT,
-        AruProduct.OSS, AruProduct.FIT),
-        InstallerType.OHS, InstallerType.DB19), // Deprecated, need to just use OHS
     ODI(Collections.singleton(AruProduct.ODI),
         InstallerType.ODI)
     ;