Use OSGi Annotations to produce felix.log manifest and clean up.

.github/workflows/maven-ci.yml

@@ -7,13 +7,15 @@ on:
       - 'scr/**'
       - 'http/**'
       - 'tools/maven-bundle-plugin/**'
+      - 'log/**'
   pull_request:
     branches: [ "master" ]
     paths:
       - 'scr/**'
       - 'http/**'
       - 'tools/maven-bundle-plugin/**'
-
+      - 'log/**'
+
 permissions: {}
 
 jobs:
@@ -30,7 +32,7 @@ jobs:
     - name: Set up Maven
       uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
       with:
-        maven-version: 3.9.7
+        maven-version: 3.9.9
     - name: Check which subproject changed and build affected ones
       uses: dorny/paths-filter@v3
       id: changes
@@ -42,10 +44,15 @@ jobs:
             - 'http/**'
           maven-bundle-plugin:
             - 'tools/maven-bundle-plugin/**'
+          log:
+            - 'log/**'
 
     - name: Felix SCR
       if: steps.changes.outputs.scr == 'true'
       run: mvn -B -V -Dstyle.color=always --file scr/pom.xml clean verify
+    - name: Felix Log
+      if: steps.changes.outputs.log == 'true'
+      run: mvn -B -V -Dstyle.color=always --file log/pom.xml clean verify
     - name: Felix HTTP 
       if: steps.changes.outputs.http == 'true'
       run: mvn -B -V -Dstyle.color=always "-Dit.test=!MissingWebsocketDependenciesIT" --file http/pom.xml clean install verify

log/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.felix</groupId>
     <artifactId>felix-parent</artifactId>
-    <version>6</version>
+    <version>9</version>
     <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -49,36 +49,52 @@
       <groupId>org.osgi</groupId>
       <artifactId>osgi.core</artifactId>
       <version>6.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.cm</artifactId>
+      <version>1.6.0</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.service.log</artifactId>
       <version>1.5.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi.annotation</artifactId>
+      <version>8.1.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.namespace.service</artifactId>
+      <version>1.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.component.annotations</artifactId>
+      <version>1.5.1</version>
+      <scope>provided</scope>
+    </dependency>
    </dependencies>
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>3.5.0</version>
+        <version>5.1.9</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
             <Export-Package>org.osgi.service.log,org.osgi.service.log.admin</Export-Package>
-            <Private-Package>org.apache.felix.log</Private-Package>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-            <Bundle-Activator>${pom.artifactId}.Activator</Bundle-Activator>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
-            <Require-Capability><![CDATA[
-                osgi.service;filter:="(objectClass=org.osgi.service.cm.ConfigurationAdmin)";effective:=active
-            ]]></Require-Capability>
-            <Provide-Capability><![CDATA[
-                osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService";uses:="org.osgi.service.log,org.osgi.service.log.admin",
-                osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.osgi.service.log,org.osgi.service.log.admin",
-                osgi.service;objectClass:List<String>="org.osgi.service.log.admin.LoggerAdmin";uses:="org.osgi.service.log,org.osgi.service.log.admin"
-            ]]></Provide-Capability>
+            <_reproducible>true</_reproducible>
           </instructions>
         </configuration>
       </plugin>

log/src/main/java/org/apache/felix/log/Activator.java

@@ -21,10 +21,14 @@
 import java.util.Dictionary;
 import java.util.Hashtable;
 
+import org.osgi.annotation.bundle.Header;
+import org.osgi.annotation.bundle.Requirement;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
+import org.osgi.namespace.service.ServiceNamespace;
+import org.osgi.resource.Namespace;
 import org.osgi.service.log.LogLevel;
 import org.osgi.service.log.LogReaderService;
 import org.osgi.service.log.LogService;
@@ -54,6 +58,10 @@
  *       the historic log information. The default value is false.</dd>
  * </dl>
  */
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
+@Requirement(namespace = ServiceNamespace.SERVICE_NAMESPACE,
+             filter = "(objectClass=org.osgi.service.cm.ConfigurationAdmin)",
+             effective = Namespace.EFFECTIVE_ACTIVE)
 public final class Activator implements BundleActivator
 {
     /** The name of the property that defines the maximum size of the log. */
@@ -108,7 +116,7 @@ private static boolean getStoreDebug(final BundleContext context)
         String storeDebugPropValue = context.getProperty(STORE_DEBUG_PROPERTY);
         if (storeDebugPropValue != null)
         {
-            storeDebug = Boolean.valueOf(storeDebugPropValue).booleanValue();
+            storeDebug = Boolean.parseBoolean(storeDebugPropValue);
         }
 
         return storeDebug;

log/src/main/java/org/apache/felix/log/ConfigurationListenerImpl.java

@@ -52,7 +52,7 @@ public class ConfigurationListenerImpl {
     final Log m_log;
     final LoggerAdminImpl m_loggerAdmin;
 
-    public ConfigurationListenerImpl(final BundleContext context, final Log log, final LoggerAdminImpl loggerAdmin) throws Exception {
+    ConfigurationListenerImpl(final BundleContext context, final Log log, final LoggerAdminImpl loggerAdmin) throws Exception {
         m_context = context;
         m_log = log;
         m_loggerAdmin = loggerAdmin;

log/src/main/java/org/apache/felix/log/FormatterLoggerImpl.java

@@ -26,12 +26,13 @@
 
 public class FormatterLoggerImpl extends LoggerImpl implements FormatterLogger {
 
-    public FormatterLoggerImpl(
+    FormatterLoggerImpl(
         final String name, final Bundle bundle, final Log log, final LoggerAdminImpl loggerAdmin) {
 
         super(name, bundle, log, loggerAdmin);
     }
 
+    @Override
     String format(String format, LogParameters logParameters) {
         StringBuilder sb = new StringBuilder();
 

log/src/main/java/org/apache/felix/log/Log.java

@@ -206,7 +206,7 @@ synchronized Enumeration<LogEntry> getEntries()
         "FrameworkEvent STARTED",
         "FrameworkEvent ERROR",
         "FrameworkEvent PACKAGES REFRESHED",
-                    "FrameworkEvent STARTLEVEL CHANGED",
+        "FrameworkEvent STARTLEVEL CHANGED",
         "FrameworkEvent WARNING",
         "FrameworkEvent INFO"
     };

log/src/main/java/org/apache/felix/log/LogEntryImpl.java

@@ -143,6 +143,7 @@ final class LogEntryImpl implements LogEntry
      * @return the bundle that created this LogEntry object;<code>null</code> if no
      * bundle is associated with this LogEntry object
      */
+    @Override
     public Bundle getBundle()
     {
         return m_bundle;
@@ -155,6 +156,7 @@ public Bundle getBundle()
      * this LogEntry object; <code>null</code> if no {@link ServiceReference} object
      * was provided
      */
+    @Override
     public ServiceReference<?> getServiceReference()
     {
         return m_serviceReference;
@@ -171,6 +173,7 @@ public ServiceReference<?> getServiceReference()
      * @see org.osgi.service.LogService#LOG_INFO
      * @see org.osgi.service.LogService#LOG_DEBUG
      */
+    @Override
     public int getLevel()
     {
         if (m_legacyLevel != m_level.ordinal()) {
@@ -184,6 +187,7 @@ public int getLevel()
      * Returns the human readable message associated with this LogEntry object.
      * @return a string containing the message associated with this LogEntry object
      */
+    @Override
     public String getMessage()
     {
         return m_message;
@@ -202,6 +206,7 @@ public String getMessage()
      * @return throwable object of the exception associated with this LogEntry;
      * <code>null</code> if no exception is associated with this LogEntry object
      */
+    @Override
     public Throwable getException()
     {
         return m_exception;
@@ -213,6 +218,7 @@ public Throwable getException()
      * @return the system time in milliseconds when this LogEntry object was created
      * @see System#currentTimeMillis()
      */
+    @Override
     public long getTime()
     {
         return m_time;

log/src/main/java/org/apache/felix/log/LogListenerThread.java

@@ -106,6 +106,7 @@ void shutdown()
      * The main method of the thread: waits for new messages to be receieved
      * and then delivers them to any registered log listeners.
      */
+    @Override
     public void run()
     {
         while (!isInterrupted())
@@ -138,10 +139,10 @@ public void run()
             {
                 // Take a snapshot of all current listeners and deliver all
                 // pending messages to them...
-                List<LogListener> listeners = new ArrayList<>();
+                List<LogListener> listeners;
                 synchronized (m_listeners)
                 {
-                    listeners.addAll(m_listeners);
+                    listeners = new ArrayList<>(m_listeners);
                 }
 
                 Iterator<LogEntry> entriesIt = entriesToDeliver.iterator();

log/src/main/java/org/apache/felix/log/LogNodeEnumeration.java

@@ -48,6 +48,7 @@ final class LogNodeEnumeration implements Enumeration<LogEntry>
      * Determines whether there are any more elements to return.
      * @return <code>true</code> if there are more elements; <code>false</code> otherwise
      */
+    @Override
     public boolean hasMoreElements()
     {
         return m_next != null;
@@ -57,6 +58,7 @@ public boolean hasMoreElements()
      * Returns the current element and moves onto the next element.
      * @return the current element
      */
+    @Override
     public LogEntry nextElement()
     {
         LogEntry result = null;

log/src/main/java/org/apache/felix/log/LogReaderServiceFactory.java

@@ -47,6 +47,7 @@ final class LogReaderServiceFactory implements ServiceFactory<LogReaderService>
      * @param registration the service registration
      * @return the log reader service implementation for the specified bundle
      */
+    @Override
     public LogReaderService getService(final Bundle bundle,
         final ServiceRegistration<LogReaderService> registration)
     {
@@ -60,6 +61,7 @@ public LogReaderService getService(final Bundle bundle,
      * @param registration the service registration
      * @param service the service to release
      */
+    @Override
     public void ungetService(final Bundle bundle,
         final ServiceRegistration<LogReaderService> registration,
         final LogReaderService service)

log/src/main/java/org/apache/felix/log/LogReaderServiceImpl.java

@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.Vector;
 
+import org.osgi.annotation.bundle.Capability;
+import org.osgi.namespace.service.ServiceNamespace;
 import org.osgi.service.log.LogEntry;
 import org.osgi.service.log.LogListener;
 import org.osgi.service.log.LogReaderService;
@@ -37,6 +39,11 @@
  * notifications about {@link org.osgi.service.log.LogEntry} objects when they are created
  * through the {@link org.osgi.service.log.LogService}.
  */
+@Capability(
+        namespace = ServiceNamespace.SERVICE_NAMESPACE,
+        attribute = { "objectClass:List<String>=\"org.osgi.service.log.LogReaderService\"" },
+        uses = { LogReaderServiceImpl.class, LogReaderService.class }
+)
 final class LogReaderServiceImpl implements LogReaderService
 {
     /** The log implementation. */

log/src/main/java/org/apache/felix/log/LogServiceFactory.java

@@ -34,7 +34,7 @@ final class LogServiceFactory implements ServiceFactory<LogService>
 
     /**
      * Create a new instance.
-     * @param log the log to associate the service implementations with.,
+     * @param loggerAdminImpl
      */
     LogServiceFactory(final LoggerAdminImpl loggerAdminImpl)
     {

log/src/main/java/org/apache/felix/log/LogServiceImpl.java

@@ -18,14 +18,23 @@
  */
 package org.apache.felix.log;
 
+import org.osgi.annotation.bundle.Capability;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;
+import org.osgi.namespace.service.ServiceNamespace;
 import org.osgi.service.log.LogService;
 import org.osgi.service.log.Logger;
+import org.osgi.service.log.LoggerFactory;
+import org.osgi.service.log.admin.LoggerAdmin;
 
 /**
  * Implementation of the OSGi {@link LogService}.
  */
+@Capability(
+        namespace = ServiceNamespace.SERVICE_NAMESPACE,
+        attribute = { "objectClass:List<String>=\"org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory\"" },
+        uses = { LogServiceImpl.class, LogService.class, LoggerFactory.class, LoggerAdmin.class }
+)
 final class LogServiceImpl implements LogService
 {
     /** The bundle associated with this implementation. */
@@ -35,9 +44,8 @@ final class LogServiceImpl implements LogService
 
     /**
      * Create a new instance.
-     * @param log the log implementation
      * @param bundle the bundle associated with this implementation
-     * @param serviceReference
+     * @param loggerAdminImpl
      */
     LogServiceImpl(final Bundle bundle, final LoggerAdminImpl loggerAdminImpl)
     {

log/src/main/java/org/apache/felix/log/LoggerAdminImpl.java

@@ -24,20 +24,27 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import org.osgi.annotation.bundle.Capability;
 import org.osgi.framework.Bundle;
+import org.osgi.namespace.service.ServiceNamespace;
 import org.osgi.service.log.FormatterLogger;
 import org.osgi.service.log.Logger;
 import org.osgi.service.log.admin.LoggerAdmin;
 import org.osgi.service.log.admin.LoggerContext;
 
+@Capability(
+        namespace = ServiceNamespace.SERVICE_NAMESPACE,
+        attribute = { "objectClass:List<String>=\"org.osgi.service.log.admin.LoggerAdmin\"" },
+        uses = { LoggerAdminImpl.class, LoggerAdmin.class }
+)
 public class LoggerAdminImpl implements LoggerAdmin {
 
     private final Log m_log;
     private final LoggerContext m_rootContext;
     private final ConcurrentMap<String, LoggerContext> m_contexts = new ConcurrentHashMap<>();
     private final ConcurrentMap<LoggerKey, Logger> _loggers = new ConcurrentHashMap<>();
 
-    public LoggerAdminImpl(final String defaultLogLevelString, final Log log) {
+    LoggerAdminImpl(final String defaultLogLevelString, final Log log) {
         m_rootContext = new RootLoggerContextImpl(defaultLogLevelString, this);
         m_log = log;
     }