modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/DeployParams.java

@@ -75,13 +75,14 @@
     List<String> arguments; //unnamed arguments
 
     // Java 9 modules support
     Set<String> addModules = new LinkedHashSet<>();
     Set<String> limitModules = new LinkedHashSet<>();
-    boolean detectModules;
-    String linkModulePath;
-    String appModulePath;
+    boolean detectModules = false;
+    boolean stripExecutables = false;
+    String modulePath;
+    String jdkModulePath;
 
     int width;
     int height;
     String embeddedWidth = null;
     String embeddedHeight = null;

@@ -254,20 +255,24 @@
 
     public void addLimitModule(String module) {
         limitModules.add(module);
     }
 
-    public void setLinkModulePath(String linkModulePath) {
-        this.linkModulePath = linkModulePath;
+    public void setModulePath(String value) {
+        this.modulePath = value;
     }
 
-    public void setAppModulePath(String appModulePath) {
-        this.appModulePath = appModulePath;
+    public void setJdkModulePath(String value) {
+        this.jdkModulePath = value;
     }
 
-    public void setDetectModules(boolean detectModules) {
-        this.detectModules = detectModules;
+    public void setDetectModules(boolean value) {
+        this.detectModules = value;
+    }
+
+    public void setStripExecutables(boolean value) {
+        this.stripExecutables = value;
     }
 
     public void setDescription(String description) {
         this.description = description;
     }

@@ -549,14 +554,16 @@
     static final Set<String> multi_args = new TreeSet<>(Arrays.asList(
             StandardBundlerParam.JVM_PROPERTIES.getID(),
             StandardBundlerParam.JVM_OPTIONS.getID(),
             StandardBundlerParam.USER_JVM_OPTIONS.getID(),
             StandardBundlerParam.ARGUMENTS.getID(),
-            JLinkBundlerHelper.LINK_MODULE_PATH.getID(),
-            JLinkBundlerHelper.APP_MODULE_PATH.getID(),
+            //StandardBundlerParam.MODULE_NAME.getID(),
+            JLinkBundlerHelper.MODULE_PATH.getID(),
+            JLinkBundlerHelper.JDK_MODULE_PATH.getID(),
             JLinkBundlerHelper.ADD_MODULES.getID(),
-            JLinkBundlerHelper.LIMIT_MODULES.getID()
+            JLinkBundlerHelper.LIMIT_MODULES.getID(),
+            JLinkBundlerHelper.STRIP_NATIVE_COMMANDS.getID()
     ));
 
     @SuppressWarnings("unchecked")
     public void addBundleArgument(String key, Object value) {
         // special hack for multi-line arguments

@@ -636,12 +643,13 @@
         bundleParams.setArguments(arguments);
 
         bundleParams.setAddModules(addModules);
         bundleParams.setLimitModules(limitModules);
         bundleParams.setDetectModules(detectModules);
-        bundleParams.setAppModulePath(appModulePath);
-        bundleParams.setLinkModulePath(linkModulePath);
+        bundleParams.setStripExecutables(stripExecutables);
+        bundleParams.setAppModulePath(jdkModulePath);
+        bundleParams.setLinkModulePath(modulePath);
 
         File appIcon = null;
         List<Map<String, ? super Object>> bundlerIcons = new ArrayList<>();
         for (Icon ic: icons) {
             //NB: in theory we should be paying attention to RunMode but