Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 8cd557d

Browse files
authoredAug 10, 2020
added JDeveloper product patches to FMW install types for recommendedPatches and LatestPSU (#198)
1 parent 9647528 commit 8cd557d

File tree

4 files changed

+34
-12
lines changed

4 files changed

+34
-12
lines changed
 

‎imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/AruProduct.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ public enum AruProduct {
1616
OUD("19748", "Oracle Unified Directory"),
1717
WCC("13946", "Oracle WebCenter Content"),
1818
WCP("15224", "Oracle WebCenter Portal"),
19-
WCS("20995", "Oracle WebCenter Sites")
19+
WCS("20995", "Oracle WebCenter Sites"),
20+
JDEV("11281", "Oracle JDeveloper")
2021
//FIT("33256", "Fusion Internal Tools") No longer used after July 2020 PSU
2122
;
2223

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,43 +26,43 @@ public enum FmwInstallerType {
2626
WLS(Arrays.asList(AruProduct.WLS, AruProduct.COH),
2727
InstallerType.WLS),
2828
// Oracle WebLogic Server Infrastructure (JRF)
29-
FMW(Arrays.asList(AruProduct.WLS, AruProduct.COH),
29+
FMW(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.JDEV),
3030
InstallerType.FMW),
3131
// Oracle Service Bus
32-
OSB(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.OSB),
32+
OSB(Utils.list(FMW.products, AruProduct.OSB),
3333
InstallerType.FMW, InstallerType.OSB),
3434
// Oracle SOA Suite
35-
SOA(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.SOA),
35+
SOA(Utils.list(FMW.products, AruProduct.SOA),
3636
InstallerType.FMW, InstallerType.SOA),
3737
// Oracle SOA Suite (with Service Bus)
38-
SOA_OSB(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.SOA, AruProduct.OSB),
38+
SOA_OSB(Utils.list(FMW.products, AruProduct.SOA, AruProduct.OSB),
3939
InstallerType.FMW, InstallerType.SOA, InstallerType.OSB),
4040
// Oracle Identity Manager
41-
IDM(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.IDM),
41+
IDM(Utils.list(FMW.products, AruProduct.IDM),
4242
InstallerType.FMW, InstallerType.IDM),
4343
// Oracle Identity Manager
4444
IDM_WLS(Collections.singletonList(AruProduct.IDM),
4545
InstallerType.IDM),
4646
// Oracle Access Manager
47-
OAM(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.OAM),
47+
OAM(Utils.list(FMW.products, AruProduct.OAM),
4848
InstallerType.FMW, InstallerType.OAM),
4949
// Oracle Identity Governance
50-
OIG(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.SOA, AruProduct.OSB, AruProduct.IDM),
50+
OIG(Utils.list(FMW.products, AruProduct.SOA, AruProduct.OSB, AruProduct.IDM),
5151
InstallerType.FMW, InstallerType.SOA, InstallerType.OSB, InstallerType.IDM),
5252
// Oracle Unified Directory
5353
OUD(Collections.singletonList(AruProduct.OUD),
5454
InstallerType.OUD),
5555
// Oracle Unified Directory
56-
OUD_WLS(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.OUD),
56+
OUD_WLS(Utils.list(FMW.products, AruProduct.OUD),
5757
InstallerType.FMW, InstallerType.OUD),
5858
// Oracle WebCenter Content
59-
WCC(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.WCC),
59+
WCC(Utils.list(FMW.products, AruProduct.WCC),
6060
InstallerType.FMW, InstallerType.WCC),
6161
// Oracle WebCenter Portal
62-
WCP(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.WCP),
62+
WCP(Utils.list(FMW.products, AruProduct.WCP),
6363
InstallerType.FMW, InstallerType.WCP),
6464
// Oracle WebCenter Sites
65-
WCS(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.WCS),
65+
WCS(Utils.list(FMW.products, AruProduct.WCS),
6666
InstallerType.FMW, InstallerType.WCS)
6767
;
6868

‎imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Utils.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@
2121
import java.nio.file.StandardCopyOption;
2222
import java.nio.file.attribute.PosixFilePermissions;
2323
import java.text.MessageFormat;
24+
import java.util.ArrayList;
2425
import java.util.Arrays;
2526
import java.util.Base64;
27+
import java.util.Collection;
28+
import java.util.Collections;
2629
import java.util.Comparator;
2730
import java.util.Enumeration;
2831
import java.util.List;
@@ -769,4 +772,18 @@ public static String getPsuVersion(String lsInventory) {
769772
logger.exiting(result);
770773
return result;
771774
}
775+
776+
/**
777+
* Create a new list from an existing collection and adding additional elements, if desired.
778+
* @param start a set of elements to start from
779+
* @param elements zero to many additional elements to add to the new list
780+
* @param <T> the class of the elements to add
781+
* @return a new list of element T
782+
*/
783+
@SafeVarargs
784+
public static <T> List<T> list(Collection<? extends T> start, T... elements) {
785+
List<T> result = new ArrayList<>(start);
786+
Collections.addAll(result, elements);
787+
return result;
788+
}
772789
}

‎imagetool/src/test/java/com/oracle/weblogic/imagetool/installer/InstallerTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ void fmwInstallerTypeListTest() {
3131
void fmwInstallerProductIds() {
3232
assertEquals(Arrays.asList(AruProduct.WLS, AruProduct.COH), FmwInstallerType.WLS.products(),
3333
"WLS product list is incorrect or out of order");
34+
assertEquals(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.JDEV),
35+
FmwInstallerType.FMW.products(), "FMW product list is incorrect or out of order");
36+
assertEquals(Arrays.asList(AruProduct.WLS, AruProduct.COH, AruProduct.JDEV, AruProduct.SOA),
37+
FmwInstallerType.SOA.products(), "SOA product list is incorrect or out of order");
3438
}
3539

3640
@Test

0 commit comments

Comments
 (0)
Please sign in to comment.