diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruProduct.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruProduct.java index 759136b8..4ab970a3 100644 --- a/imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruProduct.java +++ b/imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruProduct.java @@ -32,6 +32,7 @@ public enum AruProduct { ODI("13724", "Oracle Data Integrator"), OSS("16609", "Oracle Security Service"), OAM_WG("18388", "Oracle Access Manager Web Gates"), + FMW_GLCM("31939", "Oracle Global Lifecycle Management FMW Installer") ; private final String productId; diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/FmwInstallerType.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/FmwInstallerType.java index d22dbab5..aa328ca1 100644 --- a/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/FmwInstallerType.java +++ b/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/FmwInstallerType.java @@ -25,6 +25,7 @@ public enum FmwInstallerType { // Oracle WebLogic Server WLS(Utils.toSet(AruProduct.WLS, AruProduct.COH, AruProduct.FMWPLAT, AruProduct.FIT, AruProduct.JDBC, + AruProduct.FMW_GLCM, AruProduct.OSS), InstallerType.WLS), // Added OSS for a special patching issue for 12.2.1.4 JDBC fix WLSSLIM(Utils.toSet(WLS.products), InstallerType.WLSSLIM), @@ -80,7 +81,7 @@ public enum FmwInstallerType { WCS(Utils.toSet(FMW.products, AruProduct.WCS), InstallerType.FMW, InstallerType.WCS), OHS(Utils.toSet(AruProduct.OHS, AruProduct.OAM_WG, AruProduct.WLS, AruProduct.JDBC, AruProduct.FMWPLAT, - AruProduct.OSS, AruProduct.FIT), + AruProduct.OSS, AruProduct.FIT, AruProduct.FMW_GLCM), InstallerType.OHS, InstallerType.DB19), ODI(Collections.singleton(AruProduct.ODI), InstallerType.ODI) @@ -111,8 +112,8 @@ public Set products() { private static final LoggingFacade logger = LoggingFactory.getLogger(FmwInstallerType.class); /** - * Return a list of all WebLogic Server types (not JRF types). - * @return list of WLS enum types. + * Returns true if the installer type is a WLS installer, WLS, WLSDEV, or WLSSLIM. + * @return true if the installer is a WLS installer type. */ public static boolean isBaseWeblogicServer(FmwInstallerType value) { return weblogicServerTypes.contains(value); diff --git a/imagetool/src/test/java/com/oracle/weblogic/imagetool/installer/InstallerTest.java b/imagetool/src/test/java/com/oracle/weblogic/imagetool/installer/InstallerTest.java index 4e441429..c12dcf03 100644 --- a/imagetool/src/test/java/com/oracle/weblogic/imagetool/installer/InstallerTest.java +++ b/imagetool/src/test/java/com/oracle/weblogic/imagetool/installer/InstallerTest.java @@ -32,18 +32,19 @@ void fmwInstallerTypeListTest() { @Test void fmwInstallerProductIds() { - AruProduct[] list1 = {AruProduct.WLS, AruProduct.COH, AruProduct.FMWPLAT, AruProduct.JDBC, AruProduct.FIT, - AruProduct.OSS}; + AruProduct[] list1 = {AruProduct.WLS, AruProduct.FMW_GLCM, AruProduct.COH, AruProduct.FMWPLAT, AruProduct.JDBC, + AruProduct.FIT, AruProduct.OSS}; assertEquals(Utils.toSet(list1), FmwInstallerType.WLS.products(), "WLS product list is incorrect or out of order"); - AruProduct[] list2 = {AruProduct.WLS, AruProduct.COH, AruProduct.FMWPLAT, AruProduct.JDBC, AruProduct.FIT, - AruProduct.OSS, AruProduct.JRF, AruProduct.JDEV, AruProduct.OPSS, AruProduct.OWSM}; + AruProduct[] list2 = {AruProduct.WLS, AruProduct.COH, AruProduct.FMW_GLCM, AruProduct.FMWPLAT, AruProduct.JDBC, + AruProduct.FIT, AruProduct.OSS, AruProduct.JRF, AruProduct.JDEV, AruProduct.OPSS, AruProduct.OWSM}; assertEquals(Utils.toSet(list2), FmwInstallerType.FMW.products(), "FMW product list is incorrect or out of order"); - AruProduct[] list3 = {AruProduct.WLS, AruProduct.COH, AruProduct.FMWPLAT, AruProduct.JDBC, AruProduct.FIT, - AruProduct.OSS, AruProduct.JRF, AruProduct.JDEV, AruProduct.OPSS, AruProduct.OWSM, AruProduct.SOA}; + AruProduct[] list3 = {AruProduct.WLS, AruProduct.COH, AruProduct.FMW_GLCM, AruProduct.FMWPLAT, AruProduct.JDBC, + AruProduct.FIT, AruProduct.OSS, AruProduct.JRF, AruProduct.JDEV, AruProduct.OPSS, AruProduct.OWSM, + AruProduct.SOA}; assertEquals(Utils.toSet(list3), FmwInstallerType.SOA.products(), "SOA product list is incorrect or out of order"); }