modules/fxpackager/src/main/java/com/sun/javafx/tools/ant/DeployFXTask.java

rev 9619 : imported patch 9-jake-fxpackager.patch

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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.  Oracle designates this

@@ -106,10 +106,11 @@
     private Info appInfo = null;
     private Application app = null;
     private Resources resources = null;
     private Preferences prefs = null;
     private String codebase = null;
+    private String modulePath = null;
 
     //container to embed application into
     //could be either string id or js code. If it is string id then it needs to
     //be escaped
     private String placeholder;

@@ -133,10 +134,14 @@
 
     public void setCodebase(String str) {
         codebase = str;
     }
 
+    public void setLinkModulePath(String str) {
+        modulePath = str;
+    }
+
     public DeployFXTask() {
         packager = new PackagerLib();
         deployParams = new DeployParams();
     }
 

@@ -145,10 +150,11 @@
         deployParams.setOutfile(outfile);
         deployParams.setOutdir(new File(outdir));
         deployParams.setOfflineAllowed(offlineAllowed);
         deployParams.setVerbose(verbose);
         deployParams.setCodebase(codebase);
+        deployParams.setModulePath(modulePath);
         deployParams.setSignBundle(signBundle);
 
         if (width != null) {
             deployParams.setWidth(Integer.valueOf(width));
         }

@@ -178,10 +184,19 @@
             deployParams.setSwingAppWithEmbeddedJavaFX(
                     app.get().embeddedIntoSwing);
             deployParams.setVersion(app.get().version);
             deployParams.setId(app.get().id);
             deployParams.setServiceHint(app.get().daemon);
+
+            for (String s : app.getAddModule()) {
+                deployParams.addAddModule(s);
+            }
+            for (String s : app.getLimitModule()) {
+                deployParams.addLimitModule(s);
+            }
+            deployParams.setDetectModules(app.getDetectModules());
+            deployParams.setJdkModulePath(app.getJdkModulePath());
         }
 
         if (appInfo != null) {
             deployParams.setTitle(appInfo.title);
             deployParams.setVendor(appInfo.vendor);