src/jdk.jpackage/macosx/native/libapplauncher/MacPlatform.mm

*** 105,115 ****
              GetPackageRootDirectory()) + _T("MacOS");
  }
  
  TString MacPlatform::GetPackageRuntimeBinDirectory() {
      return FilePath::IncludeTrailingSeparator(GetPackageRootDirectory()) +
!             _T("Plugins/Java.runtime/Contents/Home/bin");
  }
  
  bool MacPlatform::UsePListForConfigFile() {
      return FilePath::FileExists(GetConfigFileName()) == false;
  }
--- 105,115 ----
              GetPackageRootDirectory()) + _T("MacOS");
  }
  
  TString MacPlatform::GetPackageRuntimeBinDirectory() {
      return FilePath::IncludeTrailingSeparator(GetPackageRootDirectory()) +
!             _T("runtime/Contents/Home/bin");
  }
  
  bool MacPlatform::UsePListForConfigFile() {
      return FilePath::FileExists(GetConfigFileName()) == false;
  }
*** 218,228 ****
      NSString *applicationSupportDirectory = [paths firstObject];
      result = [applicationSupportDirectory UTF8String];
      return result;
  }
  
! TString MacPlatform::GetBundledJVMLibraryFileName(TString RuntimePath) {
      TString result;
  
      // first try lib/, then lib/jli
      result = FilePath::IncludeTrailingSeparator(RuntimePath) +
              _T("Contents/Home/lib/libjli.dylib");
--- 218,228 ----
      NSString *applicationSupportDirectory = [paths firstObject];
      result = [applicationSupportDirectory UTF8String];
      return result;
  }
  
! TString MacPlatform::GetBundledJavaLibraryFileName(TString RuntimePath) {
      TString result;
  
      // first try lib/, then lib/jli
      result = FilePath::IncludeTrailingSeparator(RuntimePath) +
              _T("Contents/Home/lib/libjli.dylib");
*** 392,406 ****
      if (result == NULL) {
          return NULL;
      }
  
      if (UsePListForConfigFile() == false) {
!         if (result->LoadFromFile(FileName) == false) {
!             // New property file format was not found,
!             // attempt to load old property file format.
!             Helpers::LoadOldConfigFile(FileName, result);
!         }
      } else {
          NSBundle *mainBundle = [NSBundle mainBundle];
          NSDictionary *infoDictionary = [mainBundle infoDictionary];
          std::map<TString, TString> keys = GetKeys();
  
--- 392,402 ----
      if (result == NULL) {
          return NULL;
      }
  
      if (UsePListForConfigFile() == false) {
!         result->LoadFromFile(FileName);
      } else {
          NSBundle *mainBundle = [NSBundle mainBundle];
          NSDictionary *infoDictionary = [mainBundle infoDictionary];
          std::map<TString, TString> keys = GetKeys();
  
*** 469,491 ****
          return Platform::GetKeys();
      } else {
          keys.insert(std::map<TString, TString>::value_type(CONFIG_VERSION,
                  _T("app.version")));
          keys.insert(std::map<TString, TString>::value_type(CONFIG_MAINJAR_KEY,
!                 _T("JVMMainJarName")));
          keys.insert(std::map<TString, TString>::value_type(CONFIG_MAINMODULE_KEY,
!                 _T("JVMMainModuleName")));
          keys.insert(std::map<TString, TString>::value_type(
!                 CONFIG_MAINCLASSNAME_KEY, _T("JVMMainClassName")));
          keys.insert(std::map<TString, TString>::value_type(
!                 CONFIG_CLASSPATH_KEY, _T("JVMAppClasspath")));
          keys.insert(std::map<TString, TString>::value_type(APP_NAME_KEY,
                  _T("CFBundleName")));
!         keys.insert(std::map<TString, TString>::value_type(CONFIG_APP_ID_KEY,
!                 _T("JVMPreferencesID")));
!         keys.insert(std::map<TString, TString>::value_type(JVM_RUNTIME_KEY,
!                 _T("JVMRuntime")));
          keys.insert(std::map<TString, TString>::value_type(JPACKAGE_APP_DATA_DIR,
                  _T("CFBundleIdentifier")));
  
          keys.insert(std::map<TString, TString>::value_type(CONFIG_SPLASH_KEY,
                  _T("app.splash")));
--- 465,485 ----
          return Platform::GetKeys();
      } else {
          keys.insert(std::map<TString, TString>::value_type(CONFIG_VERSION,
                  _T("app.version")));
          keys.insert(std::map<TString, TString>::value_type(CONFIG_MAINJAR_KEY,
!                 _T("JavaMainJarName")));
          keys.insert(std::map<TString, TString>::value_type(CONFIG_MAINMODULE_KEY,
!                 _T("JavaMainModuleName")));
          keys.insert(std::map<TString, TString>::value_type(
!                 CONFIG_MAINCLASSNAME_KEY, _T("JavaMainClassName")));
          keys.insert(std::map<TString, TString>::value_type(
!                 CONFIG_CLASSPATH_KEY, _T("JavaAppClasspath")));
          keys.insert(std::map<TString, TString>::value_type(APP_NAME_KEY,
                  _T("CFBundleName")));
!         keys.insert(std::map<TString, TString>::value_type(JAVA_RUNTIME_KEY,
!                 _T("JavaRuntime")));
          keys.insert(std::map<TString, TString>::value_type(JPACKAGE_APP_DATA_DIR,
                  _T("CFBundleIdentifier")));
  
          keys.insert(std::map<TString, TString>::value_type(CONFIG_SPLASH_KEY,
                  _T("app.splash")));