Fix service description

Author: alexeysemenyukoracle

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxLaunchersAsServices.java

@@ -73,7 +73,7 @@ public static Path getServiceUnitFileName(String packageName, String launcherNam
     private static final class LauncherImpl extends UnixLauncherAsService {
 
         LauncherImpl(BuildEnv env, Package pkg, Launcher launcher) {
-            super(launcher, env.createResource("unit-template.service").setCategory(
+            super(pkg.app(), launcher, env.createResource("unit-template.service").setCategory(
                     I18N.getString("resource.systemd-unit-file")));
 
             unitFilename = getServiceUnitFileName(pkg.packageName(), launcher.executableName());

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

@@ -50,7 +50,7 @@ public static Path getServicePListFileName(String bundleIdentifier,
     private static class MacLauncherAsService extends UnixLauncherAsService {
 
         MacLauncherAsService(BuildEnv env, MacPackage pkg, Launcher launcher) {
-            super(launcher, env.createResource("launchd.plist.template").setCategory(I18N
+            super(pkg.app(), launcher, env.createResource("launchd.plist.template").setCategory(I18N
                     .getString("resource.launchd-plist-file")));
 
             plistFilename = getServicePListFileName(pkg.app().bundleIdentifier(), getName());

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

@@ -24,14 +24,24 @@
  */
 package jdk.jpackage.internal;
 
+import java.util.Objects;
+import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.Launcher;
 
 class LauncherAsService {
 
-    LauncherAsService(Launcher launcher, OverridableResource resource) {
+    LauncherAsService(Application app, Launcher launcher, OverridableResource resource) {
         this.name = launcher.name();
-        this.description = launcher.description();
-        this.resource = resource;
+
+        if (app.mainLauncher().orElseThrow() == launcher) {
+            // Main launcher
+            this.description = launcher.description();
+        } else {
+            // Additional launcher
+            this.description = String.format("%s (%s)", app.description(), name);
+        }
+
+        this.resource = Objects.requireNonNull(resource);
         resource.addSubstitutionDataEntry("SERVICE_DESCRIPTION", description);
     }
 

src/jdk.jpackage/unix/classes/jdk/jpackage/internal/UnixLaunchersAsServices.java

@@ -103,8 +103,8 @@ boolean isEmpty() {
 
     abstract static class UnixLauncherAsService extends LauncherAsService {
 
-        UnixLauncherAsService(Launcher launcher, OverridableResource resource) {
-            super(launcher, resource);
+        UnixLauncherAsService(Application app, Launcher launcher, OverridableResource resource) {
+            super(app, launcher, resource);
         }
 
         abstract Path descriptorFilePath(Path root);

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

@@ -107,7 +107,7 @@ void initFromParams(BuildEnv env, WinMsiPackage pkg) {
                     var launcherPath = installedAppImage.launchersDirectory().resolve(
                             launcher.executableNameWithSuffix());
                     var id = Id.File.of(launcherPath);
-                    return new WixLauncherAsService(launcher, env::createResource)
+                    return new WixLauncherAsService(pkg.app(), launcher, env::createResource)
                             .setLauncherInstallPath(toWixPath(launcherPath))
                             .setLauncherInstallPathId(id);
                 }).toList();

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

@@ -24,7 +24,6 @@
  */
 package jdk.jpackage.internal;
 
-import jdk.jpackage.internal.model.WinLauncher;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -39,6 +38,8 @@
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
+import jdk.jpackage.internal.model.WinApplication;
+import jdk.jpackage.internal.model.WinLauncher;
 import jdk.jpackage.internal.util.XmlUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -47,8 +48,8 @@
 
 class WixLauncherAsService extends LauncherAsService {
 
-    WixLauncherAsService(WinLauncher launcher, Function<String, OverridableResource> createResource) {
-        super(launcher,
+    WixLauncherAsService(WinApplication app, WinLauncher launcher, Function<String, OverridableResource> createResource) {
+        super(app, launcher,
                 createResource.apply("service-install.wxi").setCategory(
                         I18N.getString("resource.launcher-as-service-wix-file")));