src/jdk.packager/windows/classes/jdk/packager/internal/windows/WindowsBundlerParam.java
branchJDK-8200758-branch
changeset 56994 b4aca2dbe2b5
parent 56982 e094d5483bd6
--- a/src/jdk.packager/windows/classes/jdk/packager/internal/windows/WindowsBundlerParam.java	Fri Oct 19 08:57:13 2018 -0400
+++ b/src/jdk.packager/windows/classes/jdk/packager/internal/windows/WindowsBundlerParam.java	Fri Oct 19 19:29:20 2018 -0400
@@ -26,7 +26,6 @@
 package jdk.packager.internal.windows;
 
 import jdk.packager.internal.BundlerParamInfo;
-import jdk.packager.internal.JreUtils;
 import jdk.packager.internal.StandardBundlerParam;
 import jdk.packager.internal.Arguments;
 import jdk.packager.internal.RelativeFileSet;
@@ -37,8 +36,6 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import static jdk.packager.internal.JreUtils.extractJreAsRelativeFileSet;
-
 public class WindowsBundlerParam<T> extends StandardBundlerParam<T> {
 
     private static final ResourceBundle I18N = ResourceBundle.getBundle(
@@ -123,44 +120,6 @@
                     (s, p) -> Boolean.valueOf(s)
             );
 
-    // Subsetting of JRE is restricted.
-    // JRE README defines what is allowed to strip:
-    // http://www.oracle.com/technetwork/java/javase/jre-8-readme-2095710.html
-    public static final BundlerParamInfo<JreUtils.Rule[]> WIN_JRE_RULES =
-            new StandardBundlerParam<>(
-            "",
-            "",
-            ".win.runtime.rules",
-            JreUtils.Rule[].class,
-            params -> new JreUtils.Rule[]{
-                    JreUtils.Rule.prefixNeg("\\bin\\new_plugin"),
-                    JreUtils.Rule.prefixNeg("\\lib\\deploy"),
-                    JreUtils.Rule.suffixNeg(".pdb"),
-                    JreUtils.Rule.suffixNeg(".map"),
-                    JreUtils.Rule.suffixNeg("axbridge.dll"),
-                    JreUtils.Rule.suffixNeg("eula.dll"),
-                    JreUtils.Rule.substrNeg("javacpl"),
-                    JreUtils.Rule.suffixNeg("wsdetect.dll"),
-                    JreUtils.Rule.substrNeg("eployjava1.dll"),
-                    // NP and IE versions
-                    JreUtils.Rule.substrNeg("bin\\jp2"),
-                    JreUtils.Rule.substrNeg("bin\\jpi"),
-                    // Rule.suffixNeg("lib\\ext"),
-                    // need some of jars there for https to work
-                    JreUtils.Rule.suffixNeg("ssv.dll"),
-                    JreUtils.Rule.substrNeg("npjpi"),
-                    JreUtils.Rule.substrNeg("npoji"),
-                    JreUtils.Rule.suffixNeg(".exe"),
-                    // keep core deploy files as JavaFX APIs use them
-                    // Rule.suffixNeg("deploy.dll"),
-                    JreUtils.Rule.suffixNeg("deploy.jar"),
-                    // Rule.suffixNeg("javaws.jar"),
-                    // Rule.suffixNeg("plugin.jar"),
-                    JreUtils.Rule.suffix(".jar")
-            },
-            (s, p) -> null
-    );
-
     public static final BundlerParamInfo<Boolean> INSTALLDIR_CHOOSER =
             new StandardBundlerParam<> (
             I18N.getString("param.installdir-chooser.name"),