src/jdk.jpackage/share/native/libapplauncher/Package.cpp

*** 69,80 ****
      // Read from configure.cfg/Info.plist
      AutoFreePtr<ISectionalPropertyContainer> config =
              platform.GetConfigFile(platform.GetConfigFileName());
  
      config->GetValue(keys[CONFIG_SECTION_APPLICATION],
-             keys[CONFIG_APP_ID_KEY], FBootFields->FAppID);
-     config->GetValue(keys[CONFIG_SECTION_APPLICATION],
              keys[JPACKAGE_APP_DATA_DIR], FBootFields->FPackageAppDataDirectory);
      FBootFields->FPackageAppDataDirectory =
              FilePath::FixPathForPlatform(FBootFields->FPackageAppDataDirectory);
  
      // Main JAR.
--- 69,78 ----
*** 128,142 ****
          }
      }
  
      // Runtime.
      config->GetValue(keys[CONFIG_SECTION_APPLICATION],
!             keys[JVM_RUNTIME_KEY], FBootFields->FJVMRuntimeDirectory);
  
      // Read jvmargs.
      PromoteAppCDSState(config);
!     ReadJVMArgs(config);
  
      // Read args if none were passed in.
      if (FBootFields->FArgs.size() == 0) {
          OrderedMap<TString, TString> args;
  
--- 126,140 ----
          }
      }
  
      // Runtime.
      config->GetValue(keys[CONFIG_SECTION_APPLICATION],
!             keys[JAVA_RUNTIME_KEY], FBootFields->FJavaRuntimeDirectory);
  
      // Read jvmargs.
      PromoteAppCDSState(config);
!     ReadJavaOptions(config);
  
      // Read args if none were passed in.
      if (FBootFields->FArgs.size() == 0) {
          OrderedMap<TString, TString> args;
  
*** 235,245 ****
              }
          }
      }
  }
  
! void Package::ReadJVMArgs(ISectionalPropertyContainer* Config) {
      Platform& platform = Platform::GetInstance();
      std::map<TString, TString> keys = platform.GetKeys();
  
      // Evaluate based on the current AppCDS state.
      switch (platform.GetAppCDSState()) {
--- 233,243 ----
              }
          }
      }
  }
  
! void Package::ReadJavaOptions(ISectionalPropertyContainer* Config) {
      Platform& platform = Platform::GetInstance();
      std::map<TString, TString> keys = platform.GetKeys();
  
      // Evaluate based on the current AppCDS state.
      switch (platform.GetAppCDSState()) {
*** 247,264 ****
              throw Exception(_T("Internal Error"));
          }
  
          case cdsDisabled: {
              Config->GetSection(keys[CONFIG_SECTION_JAVAOPTIONS],
!                     FBootFields->FJVMArgs);
              break;
          }
  
          case cdsGenCache: {
              Config->GetSection(keys[
                      CONFIG_SECTION_APPCDSGENERATECACHEJAVAOPTIONS],
!                     FBootFields->FJVMArgs);
              break;
          }
  
          case cdsAuto:
          case cdsEnabled: {
--- 245,262 ----
              throw Exception(_T("Internal Error"));
          }
  
          case cdsDisabled: {
              Config->GetSection(keys[CONFIG_SECTION_JAVAOPTIONS],
!                     FBootFields->FJavaOptions);
              break;
          }
  
          case cdsGenCache: {
              Config->GetSection(keys[
                      CONFIG_SECTION_APPCDSGENERATECACHEJAVAOPTIONS],
!                     FBootFields->FJavaOptions);
              break;
          }
  
          case cdsAuto:
          case cdsEnabled: {
*** 280,290 ****
                                  FBootFields->FAppCDSCacheFileName);
                      }
                  }
  
                  Config->GetSection(keys[CONFIG_SECTION_APPCDSJAVAOPTIONS],
!                         FBootFields->FJVMArgs);
              }
  
              break;
          }
      }
--- 278,288 ----
                                  FBootFields->FAppCDSCacheFileName);
                      }
                  }
  
                  Config->GetSection(keys[CONFIG_SECTION_APPCDSJAVAOPTIONS],
!                         FBootFields->FJavaOptions);
              }
  
              break;
          }
      }
*** 355,366 ****
          delete FBootFields;
          FBootFields = NULL;
      }
  }
  
! OrderedMap<TString, TString> Package::GetJVMArgs() {
!     return FBootFields->FJVMArgs;
  }
  
  std::vector<TString> GetKeysThatAreNotDuplicates(OrderedMap<TString,
          TString> &Defaults, OrderedMap<TString, TString> &Overrides) {
      std::vector<TString> result;
--- 353,364 ----
          delete FBootFields;
          FBootFields = NULL;
      }
  }
  
! OrderedMap<TString, TString> Package::GetJavaOptions() {
!     return FBootFields->FJavaOptions;
  }
  
  std::vector<TString> GetKeysThatAreNotDuplicates(OrderedMap<TString,
          TString> &Defaults, OrderedMap<TString, TString> &Overrides) {
      std::vector<TString> result;
*** 477,491 ****
      }
  
      return FBootFields->FAppCDSCacheFileName;
  }
  
- TString Package::GetAppID() {
-     assert(FBootFields != NULL);
-     return FBootFields->FAppID;
- }
- 
  TString Package::GetPackageAppDataDirectory() {
      assert(FBootFields != NULL);
      return FBootFields->FPackageAppDataDirectory;
  }
  
--- 475,484 ----
*** 512,538 ****
  TString Package::GetMainClassName() {
      assert(FBootFields != NULL);
      return FBootFields->FMainClassName;
  }
  
! TString Package::GetJVMLibraryFileName() {
      assert(FBootFields != NULL);
  
!     if (FBootFields->FJVMLibraryFileName.empty() == true) {
          Platform& platform = Platform::GetInstance();
          Macros& macros = Macros::GetInstance();
!         TString jvmRuntimePath = macros.ExpandMacros(GetJVMRuntimeDirectory());
!         FBootFields->FJVMLibraryFileName =
!                 platform.GetBundledJVMLibraryFileName(jvmRuntimePath);
      }
  
!     return FBootFields->FJVMLibraryFileName;
  }
  
! TString Package::GetJVMRuntimeDirectory() {
      assert(FBootFields != NULL);
!     return FBootFields->FJVMRuntimeDirectory;
  }
  
  TString Package::GetSplashScreenFileName() {
      assert(FBootFields != NULL);
      return FBootFields->FSplashScreenFileName;
--- 505,531 ----
  TString Package::GetMainClassName() {
      assert(FBootFields != NULL);
      return FBootFields->FMainClassName;
  }
  
! TString Package::GetJavaLibraryFileName() {
      assert(FBootFields != NULL);
  
!     if (FBootFields->FJavaLibraryFileName.empty() == true) {
          Platform& platform = Platform::GetInstance();
          Macros& macros = Macros::GetInstance();
!         TString jvmRuntimePath = macros.ExpandMacros(GetJavaRuntimeDirectory());
!         FBootFields->FJavaLibraryFileName =
!                 platform.GetBundledJavaLibraryFileName(jvmRuntimePath);
      }
  
!     return FBootFields->FJavaLibraryFileName;
  }
  
! TString Package::GetJavaRuntimeDirectory() {
      assert(FBootFields != NULL);
!     return FBootFields->FJavaRuntimeDirectory;
  }
  
  TString Package::GetSplashScreenFileName() {
      assert(FBootFields != NULL);
      return FBootFields->FSplashScreenFileName;