--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java	Wed Oct 23 10:37:54 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java	Wed Oct 23 13:53:41 2019 -0400
@@ -421,10 +421,11 @@
             }
         }
 
-        try (InputStream is = OverridableResource.readDefault("main.wxs")) {
-            Files.copy(is, Paths.get(
-                    getConfig_ProjectFile(params).getAbsolutePath()));
-        }
+        createResource("main.wxs", params)
+                .setCategory(I18N.getString("resource.wxs-file"))
+                .saveToFile(Paths.get(getConfig_ProjectFile(params)
+                .getAbsolutePath()));
+
 
         return data;
     }

--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties	Wed Oct 23 10:37:54 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties	Wed Oct 23 13:53:41 2019 -0400
@@ -35,6 +35,7 @@
 resource.post-app-image-script=script to run after application image is populated
 resource.post-msi-script=script to run after msi file for exe installer is created
 resource.wxl-file-name=MsiInstallerStrings_en.wxl
+resource.wxs-file=Main wxs project file
 
 error.no-wix-tools=Can not find WiX tools (light.exe, candle.exe)
 error.no-wix-tools.advice=Download WiX 3.0 or later from https://wixtoolset.org and add it to the PATH.

--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties	Wed Oct 23 10:37:54 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties	Wed Oct 23 13:53:41 2019 -0400
@@ -35,6 +35,7 @@
 resource.post-app-image-script=script to run after application image is populated
 resource.post-msi-script=script to run after msi file for exe installer is created
 resource.wxl-file-name=MsiInstallerStrings_en.wxl
+resource.wxs-file=Main wxs project file
 
 error.no-wix-tools=Can not find WiX tools (light.exe, candle.exe)
 error.no-wix-tools.advice=Download WiX 3.0 or later from https://wixtoolset.org and add it to the PATH.

--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties	Wed Oct 23 10:37:54 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties	Wed Oct 23 13:53:41 2019 -0400
@@ -35,6 +35,7 @@
 resource.post-app-image-script=script to run after application image is populated
 resource.post-msi-script=script to run after msi file for exe installer is created
 resource.wxl-file-name=MsiInstallerStrings_en.wxl
+resource.wxs-file=Main wxs project file
 
 error.no-wix-tools=Can not find WiX tools (light.exe, candle.exe)
 error.no-wix-tools.advice=Download WiX 3.0 or later from https://wixtoolset.org and add it to the PATH.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/tools/jpackage/windows/WinResourceTest.java	Wed Oct 23 13:53:41 2019 -0400
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2018, 2019, 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.
+ *
+ * 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.
+ */
+
+import java.io.IOException;
+import java.nio.file.Path;
+import jdk.jpackage.test.TKit;
+import jdk.jpackage.test.PackageTest;
+import jdk.jpackage.test.PackageType;
+import jdk.jpackage.test.Annotations.Test;
+import java.util.List;
+
+/**
+ * Test --resource-dir option. The test should set --resource-dir to point to
+ * a dir with an empty "main.wxs" file.  As a result, jpackage should try to
+ * use the customized resource and fail.
+ */
+
+/*
+ * @test
+ * @summary jpackage with --resource-dir
+ * @library ../helpers
+ * @build jdk.jpackage.test.*
+ * @requires (os.family == "windows")
+ * @modules jdk.jpackage/jdk.jpackage.internal
+ * @compile WinResourceTest.java
+ * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=WinResourceTest
+ */
+
+public class WinResourceTest {
+    @Test
+    public static void test() throws IOException {
+        new PackageTest()
+        .forTypes(PackageType.WINDOWS)
+        .configureHelloApp()
+        .addInitializer(cmd -> {
+            Path resourceDir = TKit.createTempDirectory("resources");
+
+            // 1. Set fake run time to save time by skipping jlink step of jpackage.
+            // 2. Instruct test to save jpackage output.
+            cmd.setFakeRuntime().saveConsoleOutput(true);
+
+            cmd.addArguments("--resource-dir", resourceDir);
+            // Create invalid main wxs file in a resource dir.
+            TKit.createTextFile(resourceDir.resolve("main.wxs"), List.of(
+                    "any string that is an invalid wxs file"));
+        })
+        .addBundleVerifier((cmd, result) -> {
+            // Assert jpackage picked custom main.wxs and failed as expected by
+            // examining its output
+            TKit.assertTextStream("Using custom package resource [Main wxs project file]")
+                    .predicate(String::startsWith)
+                    .apply(result.getOutput().stream());
+            TKit.assertTextStream("error CNDL0104 : Not a valid source file")
+                    .apply(result.getOutput().stream());
+        })
+        .setExpectedExitCode(1)
+        .run();
+    }
+}