modules/fxpackager/src/test/java/hello/SimpleBundle.java

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

*** 26,35 ****
--- 26,36 ----
  package hello;
  
  import com.oracle.tools.packager.Bundler;
  import com.oracle.tools.packager.Bundlers;
  import com.oracle.tools.packager.ConfigException;
+ import com.oracle.tools.packager.JLinkBundlerHelper;
  import com.oracle.tools.packager.Log;
  import com.oracle.tools.packager.RelativeFileSet;
  import com.oracle.tools.packager.StandardBundlerParam;
  import com.oracle.tools.packager.UnsupportedPlatformException;
  
*** 75,84 ****
--- 76,89 ----
  
                  case "-b":
                      params.put(argsQ.remove(), argsQ.remove());
                      break;
  
+                 case "-modulepath":
+                     params.put(JLinkBundlerHelper.MODULE_PATH.getID(), argsQ.remove());
+                     break;
+ 
                  case "-all":
                      // JVM args
                      params.put(StandardBundlerParam.JVM_OPTIONS.getID(), "-Doption.1=bundlerargs\n-Doption.2=bundlerargs\n-Dcollide=jvmoptions");
                      // properties
                      params.put(StandardBundlerParam.JVM_PROPERTIES.getID(), "prop.1=bundlerargs\nprop.2=bundlerargs\ncollide=properties");
*** 130,149 ****
  
              bundleParams.put(BUILD_ROOT.getID(), output);
  
              File appResourcesDir = new File(".");
              File fakeMainJar = new File(appResourcesDir, "mainApp.jar");
!             File packagerJar = new File(appResourcesDir, "packager.jar");
!             Set<File> appResources = new HashSet<>(Arrays.asList(fakeMainJar, packagerJar));
  
              bundleParams.put(APP_NAME.getID(), "DevTest");
              bundleParams.put(MAIN_CLASS.getID(), "hello.TestPackager");
              bundleParams.put(MAIN_JAR.getID(),
                      new RelativeFileSet(fakeMainJar.getParentFile(),
                              new HashSet<>(Arrays.asList(fakeMainJar)))
              );
!             bundleParams.put(CLASSPATH.getID(), fakeMainJar.getName() + " " + packagerJar.getName());
              bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
              bundleParams.put(VERBOSE.getID(), true);
              bundleParams.put(ICON.getID(), "java-logo2.gif");
  
              bundleParams.putAll(params);
--- 135,153 ----
  
              bundleParams.put(BUILD_ROOT.getID(), output);
  
              File appResourcesDir = new File(".");
              File fakeMainJar = new File(appResourcesDir, "mainApp.jar");
!             Set<File> appResources = new HashSet<>(Arrays.asList(fakeMainJar));
  
              bundleParams.put(APP_NAME.getID(), "DevTest");
              bundleParams.put(MAIN_CLASS.getID(), "hello.TestPackager");
              bundleParams.put(MAIN_JAR.getID(),
                      new RelativeFileSet(fakeMainJar.getParentFile(),
                              new HashSet<>(Arrays.asList(fakeMainJar)))
              );
!             bundleParams.put(CLASSPATH.getID(), fakeMainJar.getName());
              bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
              bundleParams.put(VERBOSE.getID(), true);
              bundleParams.put(ICON.getID(), "java-logo2.gif");
  
              bundleParams.putAll(params);