--- /dev/null	2018-10-22 10:36:24.000000000 -0400
+++ new/src/jdk.packager/share/classes/jdk/packager/internal/AbstractImageBundler.java	2018-10-22 10:36:22.419034300 -0400
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.packager.internal;
+
+import java.text.MessageFormat;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static jdk.packager.internal.StandardBundlerParam.*;
+
+/**
+ * AbstractImageBundler
+ *
+ * This is the base class for each of the Application Image Bundlers.
+ *
+ * It contains methods and parameters common to all Image Bundlers.
+ *
+ * Application Image Bundlers are created in "create-image" mode,
+ * or as an intermeadiate step in "create-installer" mode.
+ *
+ * The concrete implementations are in the platform specific Bundlers.
+ */
+public abstract class AbstractImageBundler extends AbstractBundler {
+
+    private final static String JAVA_VERSION_SPEC =
+        "java version \"((\\d+).(\\d+).(\\d+).(\\d+))(-(.*))?(\\+[^\"]*)?\"";
+
+    private static final ResourceBundle I18N = ResourceBundle.getBundle(
+            "jdk.packager.internal.resources.AbstractImageBundler");
+
+    public void imageBundleValidation(Map<String, ? super Object> p)
+             throws ConfigException {
+        StandardBundlerParam.validateMainClassInfoFromAppResources(p);
+
+        boolean hasMainJar = MAIN_JAR.fetchFrom(p) != null;
+        boolean hasMainModule =
+                StandardBundlerParam.MODULE.fetchFrom(p) != null;
+        boolean hasMainClass = MAIN_CLASS.fetchFrom(p) != null;
+        boolean jreInstaller = Arguments.CREATE_JRE_INSTALLER.fetchFrom(p);
+
+        if (!hasMainJar && !hasMainModule && !hasMainClass && !jreInstaller) {
+            throw new ConfigException(
+                    I18N.getString("error.no-application-class"),
+                    I18N.getString("error.no-application-class.advice"));
+        }
+    }
+
+    public static void extractFlagsFromVersion(
+            Map<String, ? super Object> params, String versionOutput) {
+        Pattern bitArchPattern = Pattern.compile("(\\d*)[- ]?[bB]it");
+        Matcher matcher = bitArchPattern.matcher(versionOutput);
+        if (matcher.find()) {
+            params.put(".runtime.bit-arch", matcher.group(1));
+        } else {
+            // presume 32 bit on no match
+            params.put(".runtime.bit-arch", "32");
+        }
+
+        Pattern oldVersionMatcher = Pattern.compile(
+                "java version \"((\\d+.(\\d+).\\d+)(_(\\d+)))?(-(.*))?\"");
+        matcher = oldVersionMatcher.matcher(versionOutput);
+        if (matcher.find()) {
+            params.put(".runtime.version", matcher.group(1));
+            params.put(".runtime.version.release", matcher.group(2));
+            params.put(".runtime.version.major", matcher.group(3));
+            params.put(".runtime.version.update", matcher.group(5));
+            params.put(".runtime.version.minor", matcher.group(5));
+            params.put(".runtime.version.security", matcher.group(5));
+            params.put(".runtime.version.patch", "0");
+            params.put(".runtime.version.modifiers", matcher.group(7));
+        } else {
+            Pattern newVersionMatcher = Pattern.compile(JAVA_VERSION_SPEC);
+            matcher = newVersionMatcher.matcher(versionOutput);
+            if (matcher.find()) {
+                params.put(".runtime.version", matcher.group(1));
+                params.put(".runtime.version.release", matcher.group(1));
+                params.put(".runtime.version.major", matcher.group(2));
+                params.put(".runtime.version.update", matcher.group(3));
+                params.put(".runtime.version.minor", matcher.group(3));
+                params.put(".runtime.version.security", matcher.group(4));
+                params.put(".runtime.version.patch", matcher.group(5));
+                params.put(".runtime.version.modifiers", matcher.group(7));
+            } else {
+                params.put(".runtime.version", "");
+                params.put(".runtime.version.release", "");
+                params.put(".runtime.version.major", "");
+                params.put(".runtime.version.update", "");
+                params.put(".runtime.version.minor", "");
+                params.put(".runtime.version.security", "");
+                params.put(".runtime.version.patch", "");
+                params.put(".runtime.version.modifiers", "");
+            }
+        }
+    }
+}