works with WDT create domain

Former-commit-id: d373858cccfc9ff09d53b792103fca871f406f27

Author: gosurya-oracle

pom.xml

@@ -32,9 +32,9 @@
             <version>3.8.0</version>
         </dependency>
         <dependency>
-            <groupId>com.google.dagger</groupId>
-            <artifactId>dagger</artifactId>
-            <version>2.19</version>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20180813</version>
         </dependency>
     </dependencies>
 

src/main/java/com/oracle/weblogicx/imagebuilder/builder/api/model/AbstractFile.java

@@ -16,4 +16,8 @@ public AbstractFile(String key) {
     protected boolean isFileOnDisk(String filePath) {
         return filePath != null && Files.isRegularFile(Paths.get(filePath));
     }
+
+    public String getKey() {
+        return key;
+    }
 }

src/main/java/com/oracle/weblogicx/imagebuilder/builder/api/model/InstallerType.java

@@ -1,10 +1,17 @@
 package com.oracle.weblogicx.imagebuilder.builder.api.model;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.oracle.weblogicx.imagebuilder.builder.util.Constants.BUILD_ARG;
+
 @SuppressWarnings("unused")
 public enum InstallerType {
-    FMW("fmw"),
+    
+    FMW(WLSInstallerType.FMW.toString()),
     JDK("jdk"),
-    WLS("wls");
+    WDT("wdt"),
+    WLS(WLSInstallerType.WLS.toString());
 
     private String value;
 
@@ -16,4 +23,26 @@ public enum InstallerType {
     public String toString() {
         return value;
     }
+
+    public List<String> getBuildArg(String location) {
+        List<String> retVal = new ArrayList<>(2);
+        retVal.add(BUILD_ARG);
+        if (this == WLS || this == FMW) {
+            retVal.add("WLS_PKG=" + location);
+        } else if (this == JDK) {
+            retVal.add("JAVA_PKG=" + location);
+        } else {
+            retVal.add("WDT_PKG=" + location);
+        }
+        return retVal;
+    }
+
+    public static InstallerType fromValue(String value) {
+        for (InstallerType eachType : InstallerType.values()) {
+            if (eachType.value.equalsIgnoreCase(value)) {
+                return eachType;
+            }
+        }
+        throw new IllegalArgumentException("argument " + value + " does not match any InstallerType");
+    }
 }

src/main/java/com/oracle/weblogicx/imagebuilder/builder/api/model/JDKVersionValues.java

@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.DEFAULT_JDK_VERSION;
+import static com.oracle.weblogicx.imagebuilder.builder.util.Constants.DEFAULT_JDK_VERSION;
 
 public class JDKVersionValues extends ArrayList<String> {
     JDKVersionValues() {

src/main/java/com/oracle/weblogicx/imagebuilder/builder/api/model/WLSVersionValues.java

@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.DEFAULT_WLS_VERSION;
+import static com.oracle.weblogicx.imagebuilder.builder.util.Constants.DEFAULT_WLS_VERSION;
 
 public class WLSVersionValues extends ArrayList<String> {
     WLSVersionValues() {

src/main/java/com/oracle/weblogicx/imagebuilder/builder/cli/CLIDriver.java

@@ -2,6 +2,7 @@
 
 import com.oracle.weblogicx.imagebuilder.builder.api.model.CommandResponse;
 import com.oracle.weblogicx.imagebuilder.builder.cli.menu.CreateImage;
+import com.oracle.weblogicx.imagebuilder.builder.cli.menu.PublishImage;
 import com.oracle.weblogicx.imagebuilder.builder.cli.menu.UpdateImage;
 import com.oracle.weblogicx.imagebuilder.builder.cli.cache.CacheCLI;
 import picocli.CommandLine;
@@ -13,19 +14,20 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.CLI_OPTION;
+import static com.oracle.weblogicx.imagebuilder.builder.util.Constants.CLI_OPTION;
 
 @Command(
         name = "imagebuilder",
         mixinStandardHelpOptions = true,
-        description = "%nImageBuilder is a tool to help menu docker images of WebLogic with selected " +
+        description = "%nImageBuilder is a tool to build docker images of WebLogic with selected " +
                       "patches and/or psu(s) applied.%n",
         version = "1.0",
         sortOptions = false,
         subcommands = {
                 CacheCLI.class,
                 CreateImage.class,
                 UpdateImage.class,
+                PublishImage.class,
                 HelpCommand.class
         },
         requiredOptionMarker = '*',

src/main/java/com/oracle/weblogicx/imagebuilder/builder/cli/cache/AddEntry.java

@@ -1,21 +1,17 @@
 package com.oracle.weblogicx.imagebuilder.builder.cli.cache;
 
 import com.oracle.weblogicx.imagebuilder.builder.api.model.CommandResponse;
-import com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants;
-import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Spec;
 import picocli.CommandLine.Unmatched;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.Callable;
 
 import static com.oracle.weblogicx.imagebuilder.builder.impl.meta.FileMetaDataResolver.META_RESOLVER;
-import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.CLI_OPTION;
+import static com.oracle.weblogicx.imagebuilder.builder.util.Constants.CLI_OPTION;
 
 @Command(
         name = "addEntry",

src/main/java/com/oracle/weblogicx/imagebuilder/builder/cli/cache/AddInstallerEntry.java

@@ -13,7 +13,7 @@
 
 import static com.oracle.weblogicx.imagebuilder.builder.impl.meta.FileMetaDataResolver.META_RESOLVER;
 import static com.oracle.weblogicx.imagebuilder.builder.api.meta.MetaDataResolver.CACHE_KEY_SEPARATOR;
-import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.DEFAULT_WLS_VERSION;
+import static com.oracle.weblogicx.imagebuilder.builder.util.Constants.DEFAULT_WLS_VERSION;
 
 @Command(
         name = "addInstaller",
@@ -24,7 +24,7 @@
 public class AddInstallerEntry implements Callable<CommandResponse> {
     @Override
     public CommandResponse call() throws Exception {
-        if ( location != null && Files.exists(location) && location.toFile().isFile() ) {
+        if (location != null && Files.isRegularFile(location)) {
             String key = String.format("%s%s%s", type, CACHE_KEY_SEPARATOR, version);
             META_RESOLVER.addToCache(key, location.toAbsolutePath().toString());
             return new CommandResponse(0, String.format("Successfully added to cache. %s=%s", key,
@@ -43,7 +43,7 @@ public CommandResponse call() throws Exception {
 
     @Option(
             names = { "--ver" },
-            description = "Installer version. For WLS|FMW, Ex: 12.2.1.3.0 For jdk, Ex: 8u191",
+            description = "Installer version. Ex: For WLS|FMW use 12.2.1.3.0 For jdk, use 8u201",
             required = true,
             defaultValue = DEFAULT_WLS_VERSION
     )

src/main/java/com/oracle/weblogicx/imagebuilder/builder/cli/cache/AddPatchEntry.java

@@ -19,7 +19,7 @@
 
 import static com.oracle.weblogicx.imagebuilder.builder.impl.meta.FileMetaDataResolver.META_RESOLVER;
 import static com.oracle.weblogicx.imagebuilder.builder.api.meta.MetaDataResolver.CACHE_KEY_SEPARATOR;
-import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.DEFAULT_WLS_VERSION;
+import static com.oracle.weblogicx.imagebuilder.builder.util.Constants.DEFAULT_WLS_VERSION;
 
 @Command(
         name = "addPatch",

src/main/java/com/oracle/weblogicx/imagebuilder/builder/cli/cache/CacheCLI.java

@@ -12,7 +12,7 @@
 import java.util.List;
 import java.util.concurrent.Callable;
 
-import static com.oracle.weblogicx.imagebuilder.builder.util.ARUConstants.CLI_OPTION;
+import static com.oracle.weblogicx.imagebuilder.builder.util.Constants.CLI_OPTION;
 
 @Command(
         name = "cache",