Index: modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/BundleParams.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/BundleParams.java	(revision Local version)
+++ modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/bundlers/BundleParams.java	(revision Shelved version)
@@ -1,0 +1,0 @@
Index: modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/PackagerLib.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/PackagerLib.java	(revision Local version)
+++ modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/PackagerLib.java	(revision Shelved version)
@@ -399,6 +399,13 @@
                         = deployParams.isSwingApp ?
                             (deployParams.outfile + "_browser.jnlp") : jnlp_filename_webstart;
                 String html_filename = deployParams.outfile + ".html";
+                //In case of FX app we will have one JNLP and one HTML
+                //In case of Swing with FX we will have 2 JNLP files and one HTML
+                String jnlp_filename_webstart = deployParams.outfile + ".jnlp";
+                String jnlp_filename_browser
+                        = deployParams.isSwingApp ?
+                            (deployParams.outfile + "_browser.jnlp") : jnlp_filename_webstart;
+                String html_filename = deployParams.outfile + ".html";
 
                 //create out dir
                 File odir = deployParams.outdir;
Index: modules/fxpackager/src/main/java/com/sun/javafx/tools/ant/DeployFXTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/fxpackager/src/main/java/com/sun/javafx/tools/ant/DeployFXTask.java	(revision Local version)
+++ modules/fxpackager/src/main/java/com/sun/javafx/tools/ant/DeployFXTask.java	(revision Shelved version)
@@ -1,0 +1,0 @@
Index: modules/fxpackager/src/main/java/com/sun/javafx/tools/ant/Application.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/fxpackager/src/main/java/com/sun/javafx/tools/ant/Application.java	(revision Local version)
+++ modules/fxpackager/src/main/java/com/sun/javafx/tools/ant/Application.java	(revision Shelved version)
@@ -172,6 +172,15 @@
     }
 
     /**
+     * Is this class a daemon/service?
+     *
+     * @ant.not-required Default is false, i.e. an interactive app
+     */
+    public void setDaemon(boolean b) {
+        daemon = b;
+    }
+
+    /**
      * Preloader class to be used.
      *
      * @ant.not-required Default is preloader shipped in JavaFX Runtime.
Index: modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/DeployParams.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/DeployParams.java	(revision Local version)
+++ modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/DeployParams.java	(revision Shelved version)
@@ -1,0 +1,0 @@
Index: modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/Main.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/Main.java	(revision Local version)
+++ modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/Main.java	(revision Shelved version)
@@ -1,0 +1,0 @@