--- old/modules/fxpackager/src/main/java/com/sun/javafx/tools/ant/Application.java	2016-06-22 10:08:01.000000000 -0700
+++ new/modules/fxpackager/src/main/java/com/sun/javafx/tools/ant/Application.java	2016-06-22 10:08:01.000000000 -0700
@@ -31,6 +31,7 @@
 import java.util.Properties;
 import com.sun.javafx.tools.packager.HtmlParam;
 import com.sun.javafx.tools.packager.Param;
+//import java.nio.file.Path;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.DataType;
 import org.apache.tools.ant.types.Reference;
@@ -50,6 +51,7 @@
  */
 public class Application extends DataType implements Cloneable {
     String mainClass = null;
+    String module = null;
     String preloaderClass = null;
     String name = null;
     List<Param> parameters = new LinkedList<Param>();
@@ -61,11 +63,6 @@
     String version = null;
     Boolean daemon = null;
 
-    public List<Argument> addModule = new LinkedList<Argument>();
-    public List<Argument> limitModule = new LinkedList<Argument>();
-    String modulepath;
-    boolean stripExecutables;
-
     public void setVersion(String v) {
         version = v;
     }
@@ -106,10 +103,14 @@
     }
 
     public class Argument {
-        String value;
+        private String value;
+
+        public void addText(String value) {
+            this.value = value;
+        }
 
-        public void addText(String v) {
-            value = getProject().replaceProperties(v);
+        public String getValue() {
+            return this.value;
         }
     }
 
@@ -168,107 +169,39 @@
     }
 
     /**
-     * Preloader class to be used.
-     *
-     * @ant.not-required Default is preloader shipped in JavaFX Runtime.
-     */
-    public void setPreloaderClass(String v) {
-        preloaderClass = v;
-    }
-
-    /**
-     * Is this class a daemon/service?
-     *
-     * @ant.not-required Default is false, i.e. an interactive app
-     */
-    public void setDaemon(boolean b) {
-        daemon = b;
-    }
-
-
-    /**
-     * "addModule" declaration for the application's runtime.
-     *
-     * Modules can be specified per-element, or comma/colon/semi-colon/space separated
-     *
-     * @ant.not-required Default is to bundle the whole platform
-     */
-    public Argument createAddModule() {
-        Argument a = new Argument();
-        addModule.add(a);
-        return a;
-    }
-
-    /**
-     * "addModule" declaration for the application's runtime
-     *
-     * @ant.not-required Default is to bundle the whole platform
-     */
-    List<String> getAddModule() {
-        List<String> lst = new LinkedList();
-        for(Argument a: arguments) {
-            for (String s : a.value.split("[:;,\\s]+")) {
-                lst.add(s);
-            }
-        }
-        return lst;
-    }
-
-    /**
-     * "limitModule" declaration for the application's runtime.
+     * Module containing the application class.
      *
-     * Modules can be specified per-element, or comma/colon/semi-colon/space separated
-     *
-     * @ant.not-required Default is to bundle the whole platform
+     * @ant.not-required Default is to not bundle as a modular application.
      */
-    public Argument createLimitModule() {
-        Argument a = new Argument();
-        addModule.add(a);
-        return a;
+    public String getModule() {
+        return this.module;
     }
 
     /**
-     * "limitModule" declaration for the application's runtime
+     * Module containing the application class.
      *
-     * @ant.not-required Default is to bundle the whole platform
+     * @ant.not-required Default is to not bundle as a modular application.
      */
-    List<String> getLimitModule() {
-        List<String> lst = new LinkedList();
-        for(Argument a: arguments) {
-            for (String s : a.value.split("[:;,\\s]+")) {
-                lst.add(s);
-            }
-        }
-        return lst;
+    public void setModule(String value) {
+        this.module = value;
     }
 
     /**
+     * Preloader class to be used.
      *
+     * @ant.not-required Default is preloader shipped in JavaFX Runtime.
      */
-    public String getModulePath() {
-        return modulepath;
+    public void setPreloaderClass(String v) {
+        preloaderClass = v;
     }
 
     /**
+     * Is this class a daemon/service?
      *
+     * @ant.not-required Default is false, i.e. an interactive app
      */
-    public void setModulePath(String Value) {
-        this.modulepath = Value;
-    }
-
-    /**
-     * Whether or not the bundler should attempt to detect and add used modules
-     */
-    public boolean getStripExecutables() {
-        return stripExecutables;
-    }
-
-    /**
-     * Whether or not the bundler should attempt to detect and add used modules
-     * @ant.not-required default is false
-     */
-    public void setStripExecutables(boolean Value) {
-        this.stripExecutables = Value;
+    public void setDaemon(boolean b) {
+        daemon = b;
     }
 
     //return instance that actually has data. Could be referenced object ...
@@ -285,6 +218,6 @@
 
     @Override
     public String toString() {
-        return "Application[id="+id+", mainClass="+mainClass+"]";
+        return "Application[id=" + id + ", mainClass=" + mainClass + "]";
     }
 }