--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java	Tue Oct 15 14:00:04 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java	Wed Oct 16 09:57:23 2019 -0400
@@ -25,31 +25,19 @@
 
 package jdk.jpackage.internal;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.BufferedInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.StandardCopyOption;
-import java.nio.file.Files;
-import java.text.MessageFormat;
 import java.util.Map;
-import java.util.ResourceBundle;
 
-import jdk.jpackage.internal.resources.ResourceLocator;
 
 /**
  * AbstractBundler
  *
- * This is the base class all Bundlers extend from.
- * It contains methods and parameters common to all Bundlers.
- * The concrete implementations are in the platform specific Bundlers.
+ * This is the base class all bundlers extend from.
+ * It contains methods and parameters common to all bundlers.
+ * The concrete implementations are in the platform specific bundlers.
  */
-public abstract class AbstractBundler implements Bundler {
-
-    private static final ResourceBundle I18N = ResourceBundle.getBundle(
-            "jdk.jpackage.internal.resources.MainResources");
+abstract class AbstractBundler implements Bundler {
 
     static final BundlerParamInfo<File> IMAGES_ROOT =
             new StandardBundlerParam<>(
@@ -59,118 +47,6 @@
                 StandardBundlerParam.TEMP_ROOT.fetchFrom(params), "images"),
             (s, p) -> null);
 
-    public InputStream getResourceAsStream(String name) {
-        return ResourceLocator.class.getResourceAsStream(name);
-    }
-
-    protected void fetchResource(String publicName, String category,
-            String defaultName, File result, boolean verbose, File publicRoot)
-            throws IOException {
-
-        try (InputStream is = streamResource(publicName, category,
-                defaultName, verbose, publicRoot)) {
-            if (is != null) {
-                Files.copy(is, result.toPath(),
-                        StandardCopyOption.REPLACE_EXISTING);
-            } else {
-                if (verbose) {
-                    Log.verbose(MessageFormat.format(I18N.getString(
-                            "message.no-default-resource"),
-                            defaultName == null ? "" : defaultName,
-                            category == null ? "" : "[" + category + "] ",
-                            publicName));
-                }
-            }
-        }
-    }
-
-    protected void fetchResource(String publicName, String category,
-            File defaultFile, File result, boolean verbose, File publicRoot)
-            throws IOException {
-
-        try (InputStream is = streamResource(publicName, category,
-                null, verbose, publicRoot)) {
-            if (is != null) {
-                Files.copy(is, result.toPath());
-            } else {
-                IOUtils.copyFile(defaultFile, result);
-                if (verbose) {
-                    Log.verbose(MessageFormat.format(I18N.getString(
-                            "message.using-custom-resource-from-file"),
-                            category == null ? "" : "[" + category + "] ",
-                            defaultFile.getAbsoluteFile()));
-                }
-            }
-        }
-    }
-
-    private InputStream streamResource(String publicName, String category,
-            String defaultName, boolean verbose, File publicRoot)
-            throws IOException {
-        boolean custom = false;
-        InputStream is = null;
-        if (publicName != null) {
-            if (publicRoot != null) {
-                File publicResource = new File(publicRoot, publicName);
-                if (publicResource.exists() && publicResource.isFile()) {
-                    is = new BufferedInputStream(
-                            new FileInputStream(publicResource));
-                }
-            } else {
-                is = getResourceAsStream(publicName);
-            }
-            custom = (is != null);
-        }
-        if (is == null && defaultName != null) {
-            is = getResourceAsStream(defaultName);
-        }
-        if (verbose && is != null) {
-            String msg = null;
-            if (custom) {
-                msg = MessageFormat.format(I18N.getString(
-                        "message.using-custom-resource"),
-                        category == null ?
-                        "" : "[" + category + "] ", publicName);
-            } else {
-                msg = MessageFormat.format(I18N.getString(
-                        "message.using-default-resource"),
-                        defaultName == null ? "" : defaultName,
-                        category == null ? "" : "[" + category + "] ",
-                        publicName);
-            }
-            Log.verbose(msg);
-        }
-        return is;
-    }
-
-    protected String preprocessTextResource(String publicName, String category,
-            String defaultName, Map<String, String> pairs,
-            boolean verbose, File publicRoot) throws IOException {
-        InputStream inp = streamResource(
-                publicName, category, defaultName, verbose, publicRoot);
-        if (inp == null) {
-            throw new RuntimeException(
-                    "Jar corrupt? No " + defaultName + " resource!");
-        }
-
-        // read fully into memory
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        byte[] buffer = new byte[1024];
-        int length;
-        while ((length = inp.read(buffer)) != -1) {
-            baos.write(buffer, 0, length);
-        }
-
-        // substitute
-        String result = new String(baos.toByteArray());
-        for (Map.Entry<String, String> e : pairs.entrySet()) {
-            if (e.getValue() != null) {
-                result = result.replace(e.getKey(), e.getValue());
-            }
-        }
-        return result;
-    }
-
     @Override
     public String toString() {
         return getName();