modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppStoreBundlerTest.java

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

*** 189,199 ****
          bundleParams.put(MacAppBundler.MAC_CATEGORY.getID(), "public.app-category.developer-tools");
          bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
          bundleParams.put(VERBOSE.getID(), true);
  
          if (runtimeJdk != null) {
!             bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
          }
  
          boolean valid = bundler.validate(bundleParams);
          assertTrue(valid);
  
--- 189,199 ----
          bundleParams.put(MacAppBundler.MAC_CATEGORY.getID(), "public.app-category.developer-tools");
          bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
          bundleParams.put(VERBOSE.getID(), true);
  
          if (runtimeJdk != null) {
! //FIXME            bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
          }
  
          boolean valid = bundler.validate(bundleParams);
          assertTrue(valid);
  
*** 241,251 ****
          bundleParams.put(JVM_PROPERTIES.getID(), "everything.jvm.property=everything.jvm.property.value");
          bundleParams.put(MAC_CATEGORY.getID(), "public.app-category.developer-tools");
          bundleParams.put(MAC_CF_BUNDLE_IDENTIFIER.getID(), "com.example.everything.cf-bundle-identifier");
          bundleParams.put(MAC_CF_BUNDLE_NAME.getID(), "Everything CF Bundle Name");
          bundleParams.put(MAC_CF_BUNDLE_VERSION.getID(), "8.2.0");
!         bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk == null ? System.getProperty("java.home") : runtimeJdk);
          bundleParams.put(MAIN_CLASS.getID(), "hello.HelloRectangle");
          bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
          bundleParams.put(PREFERENCES_ID.getID(), "everything/preferences/id");
          bundleParams.put(PRELOADER_CLASS.getID(), "hello.HelloPreloader");
          bundleParams.put(SIGNING_KEYCHAIN.getID(), "");
--- 241,251 ----
          bundleParams.put(JVM_PROPERTIES.getID(), "everything.jvm.property=everything.jvm.property.value");
          bundleParams.put(MAC_CATEGORY.getID(), "public.app-category.developer-tools");
          bundleParams.put(MAC_CF_BUNDLE_IDENTIFIER.getID(), "com.example.everything.cf-bundle-identifier");
          bundleParams.put(MAC_CF_BUNDLE_NAME.getID(), "Everything CF Bundle Name");
          bundleParams.put(MAC_CF_BUNDLE_VERSION.getID(), "8.2.0");
! //FIXME        bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk == null ? System.getProperty("java.home") : runtimeJdk);
          bundleParams.put(MAIN_CLASS.getID(), "hello.HelloRectangle");
          bundleParams.put(MAIN_JAR.getID(), "mainApp.jar");
          bundleParams.put(PREFERENCES_ID.getID(), "everything/preferences/id");
          bundleParams.put(PRELOADER_CLASS.getID(), "hello.HelloPreloader");
          bundleParams.put(SIGNING_KEYCHAIN.getID(), "");
*** 322,332 ****
          bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
          bundleParams.put(IDENTIFIER.getID(), "com.example.javapackager.hello.TestPackager");
          bundleParams.put(MacAppBundler.MAC_CATEGORY.getID(), "public.app-category.developer-tools");
          bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
          bundleParams.put(VERBOSE.getID(), true);
!         bundleParams.put(MAC_RUNTIME.getID(), jre);
  
          boolean valid = bundler.validate(bundleParams);
          assertTrue(valid);
  
          File result = bundler.execute(bundleParams, new File(workDir, "jre"));
--- 322,332 ----
          bundleParams.put(CLASSPATH.getID(), "mainApp.jar");
          bundleParams.put(IDENTIFIER.getID(), "com.example.javapackager.hello.TestPackager");
          bundleParams.put(MacAppBundler.MAC_CATEGORY.getID(), "public.app-category.developer-tools");
          bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
          bundleParams.put(VERBOSE.getID(), true);
! //FIXME        bundleParams.put(MAC_RUNTIME.getID(), jre);
  
          boolean valid = bundler.validate(bundleParams);
          assertTrue(valid);
  
          File result = bundler.execute(bundleParams, new File(workDir, "jre"));
*** 359,369 ****
          bundleParams.put(MacAppBundler.MAC_CATEGORY.getID(), "public.app-category.developer-tools");
          bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
          bundleParams.put(VERBOSE.getID(), true);
  
          if (runtimeJdk != null) {
!             bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
          }
  
          bundleParams.put(SIGN_BUNDLE.getID(), false);
  
          bundler.validate(bundleParams);
--- 359,369 ----
          bundleParams.put(MacAppBundler.MAC_CATEGORY.getID(), "public.app-category.developer-tools");
          bundleParams.put(APP_RESOURCES.getID(), new RelativeFileSet(appResourcesDir, appResources));
          bundleParams.put(VERBOSE.getID(), true);
  
          if (runtimeJdk != null) {
! //FIXME            bundleParams.put(MAC_RUNTIME.getID(), runtimeJdk);
          }
  
          bundleParams.put(SIGN_BUNDLE.getID(), false);
  
          bundler.validate(bundleParams);