OSVersionCondition: bugfix; CfgFile: minor; signing: fix entitlements

Author: alexeysemenyukoracle

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigningConfigBuilder.java

@@ -71,7 +71,7 @@ Optional<AppImageSigningConfig> create() throws ConfigException {
             return identityCfg.map(cfg -> {
                 return new AppImageSigningConfig.Stub(cfg.identity(), signingIdentifierPrefix,
                         validatedEntitlements, cfg.keychain().map(Keychain::name),
-                        Optional.ofNullable(entitlementsResourceName).orElse("sandbox.plist"));
+                        Optional.ofNullable(entitlementsResourceName).orElse("entitlements.plist"));
             });
         }
     }

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromParams.java

@@ -144,7 +144,7 @@ private static MacApplication createMacApplication(
 
             final var signingBuilder = new AppImageSigningConfigBuilder(signingIdentityBuilder);
             if (appStore) {
-                signingBuilder.entitlementsResourceName("entitlements.plist");
+                signingBuilder.entitlementsResourceName("sandbox.plist");
             }
 
             app.mainLauncher().flatMap(Launcher::startupInfo).ifPresent(signingBuilder::signingIdentifierPrefix);

src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java

@@ -126,7 +126,7 @@ void create(ApplicationLayout appLayout) throws IOException {
     private record Referencies(Path appModsDirectory) {
 
         Referencies {
-            if (!appModsDirectory.getParent().equals(appDirectory())) {
+            if (!appModsDirectory.startsWith(appDirectory())) {
                 throw new IllegalArgumentException();
             }
         }

src/jdk.jpackage/windows/classes/jdk/jpackage/internal/OSVersionCondition.java

@@ -56,9 +56,9 @@ static OSVersionCondition createFromAppImage(BuildEnv env, Application app) {
 
         final var appImageLayout = app.imageLayout().resolveAt(env.appImageDir());
 
-        app.mainLauncher().ifPresent(mainLauncher -> {
-            ((ApplicationLayout)appImageLayout).launchersDirectory().resolve(mainLauncher.executableNameWithSuffix());
-        });
+        app.mainLauncher().map(mainLauncher -> {
+            return ((ApplicationLayout)appImageLayout).launchersDirectory().resolve(mainLauncher.executableNameWithSuffix());
+        }).ifPresent(executables::add);
 
         executables.add(appImageLayout.runtimeDirectory().resolve("bin\\java.dll"));