diff -r bd4ce7f9ea2c -r 06bc4bd64599 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java --- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java Tue Dec 18 19:31:20 2018 -0500 +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java Fri Dec 21 07:40:47 2018 -0500 @@ -25,8 +25,6 @@ package jdk.jpackage.internal; -import jdk.jpackage.internal.resources.WinResources; - import java.io.*; import java.nio.charset.Charset; import java.nio.file.Files; @@ -206,12 +204,6 @@ "null".equalsIgnoreCase(s))? false : Boolean.valueOf(s) ); - public WinMsiBundler() { - super(); - baseResourceLoader = WinResources.class; - } - - @Override public String getName() { return I18N.getString("msi.bundler.name"); @@ -602,13 +594,12 @@ private boolean prepareBasicProjectConfig( Map params) throws IOException { - fetchResource(WinAppBundler.WIN_BUNDLER_PREFIX + - getConfig_Script(params).getName(), + fetchResource(getConfig_Script(params).getName(), I18N.getString("resource.post-install-script"), (String) null, getConfig_Script(params), VERBOSE.fetchFrom(params), - DROP_IN_RESOURCES_ROOT.fetchFrom(params)); + RESOURCE_DIR.fetchFrom(params)); return true; } @@ -708,11 +699,10 @@ new FileWriter(getConfig_ProjectFile(params))); String content = preprocessTextResource( - WinAppBundler.WIN_BUNDLER_PREFIX + getConfig_ProjectFile(params).getName(), I18N.getString("resource.wix-config-file"), wxs, data, VERBOSE.fetchFrom(params), - DROP_IN_RESOURCES_ROOT.fetchFrom(params)); + RESOURCE_DIR.fetchFrom(params)); w.write(content); w.close(); return true;