[felix-atomos] 04/05: Specify Main-Class manifest header all in AtomosLauncher class

[tj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-atomos.git

commit 28fae97781dea58bc5b846a49d196cce5f9874b3
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Mon Feb 1 16:03:53 2021 -0600

    Specify Main-Class manifest header all in AtomosLauncher class
---
 atomos.runtime/pom.xml                                                 | 3 ---
 .../src/main/java/org/apache/felix/atomos/launch/AtomosLauncher.java   | 2 ++
 .../src/main/java/org/apache/felix/atomos/launch/package-info.java     | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/atomos.runtime/pom.xml b/atomos.runtime/pom.xml
index cae744a..6f12d59 100644
--- a/atomos.runtime/pom.xml
+++ b/atomos.runtime/pom.xml
@@ -120,9 +120,6 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
-                        <manifest>
-                            <mainClass>org.apache.felix.atomos.launch.AtomosLauncher</mainClass>
-                        </manifest>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                     </archive>
                 </configuration>
diff --git a/atomos.runtime/src/main/java/org/apache/felix/atomos/launch/AtomosLauncher.java b/atomos.runtime/src/main/java/org/apache/felix/atomos/launch/AtomosLauncher.java
index 2fa5b1d..2765e45 100644
--- a/atomos.runtime/src/main/java/org/apache/felix/atomos/launch/AtomosLauncher.java
+++ b/atomos.runtime/src/main/java/org/apache/felix/atomos/launch/AtomosLauncher.java
@@ -30,8 +30,10 @@ import org.osgi.framework.launch.Framework;
  * The Atomos launcher contains convenience methods for creating and launching
  * an OSGi {@link Framework} instance with the Atomos runtime.
  */
+@org.osgi.annotation.bundle.Header(name = "Main-Class", value = org.apache.felix.atomos.launch.AtomosLauncher.ATOMOS_LAUNCHER)
 public class AtomosLauncher
 {
+    // package private constant use to specify the main class
     static final String ATOMOS_LAUNCHER = "org.apache.felix.atomos.launch.AtomosLauncher";
     /**
      * A main method that can be used by executable jars to initialize and start an
diff --git a/atomos.runtime/src/main/java/org/apache/felix/atomos/launch/package-info.java b/atomos.runtime/src/main/java/org/apache/felix/atomos/launch/package-info.java
index 4ff1597..56cc0dc 100644
--- a/atomos.runtime/src/main/java/org/apache/felix/atomos/launch/package-info.java
+++ b/atomos.runtime/src/main/java/org/apache/felix/atomos/launch/package-info.java
@@ -13,5 +13,4 @@
  */
 @org.osgi.annotation.bundle.Export
 @org.osgi.annotation.versioning.Version("1.0.0")
-@org.osgi.annotation.bundle.Header(name = "Main-Class", value = org.apache.felix.atomos.launch.AtomosLauncher.ATOMOS_LAUNCHER)
 package org.apache.felix.atomos.launch;
\ No newline at end of file