From 1292f559da42582da26f09e102b2b87b87dcc72c Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Thu, 15 Sep 2022 21:55:32 +0200 Subject: [PATCH] Unify connect.properties location and fix release-notes of OSGi-Connect --- RELEASE_NOTES.md | 2 +- .../osgi/connect/PlexusFrameworkConnectServiceFactory.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 0a71e44c44..2e83ad457f 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -80,7 +80,7 @@ public class MyPlexusComponent { For the setup you need to do the following: 1. include any bundle you like to make up your plexus-osgi-connect framework as a dependency of your maven plugin -2. include a file `META-INF/sisu-connect.bundles` that list all your bundles you like to have installed in the format `bsn[,true]`, where `bsn` is the symbolid name and optionally you can control if your bundle has to be started or not +2. include a file `META-INF/sisu/connect.bundles` that list all your bundles you like to have installed in the format `bsn[,true]`, where `bsn` is the symbolid name and optionally you can control if your bundle has to be started or not 3. include the following additional dependency ``` diff --git a/sisu-osgi/sisu-osgi-connect/src/main/java/org/eclipse/sisu/osgi/connect/PlexusFrameworkConnectServiceFactory.java b/sisu-osgi/sisu-osgi-connect/src/main/java/org/eclipse/sisu/osgi/connect/PlexusFrameworkConnectServiceFactory.java index 34f5173913..f7271cb48a 100644 --- a/sisu-osgi/sisu-osgi-connect/src/main/java/org/eclipse/sisu/osgi/connect/PlexusFrameworkConnectServiceFactory.java +++ b/sisu-osgi/sisu-osgi-connect/src/main/java/org/eclipse/sisu/osgi/connect/PlexusFrameworkConnectServiceFactory.java @@ -201,7 +201,7 @@ private static Map readProperties(ClassLoader classloader, Logge Map frameworkProperties = new HashMap<>(); Enumeration resources; try { - resources = classloader.getResources("META-INF/sisu-connect.properties"); + resources = classloader.getResources("META-INF/sisu/connect.properties"); } catch (IOException e1) { return frameworkProperties; } @@ -229,7 +229,7 @@ private static void printFrameworkState(Framework framework, Logger log) { Comparator byState = Comparator.comparingInt(Bundle::getState); Arrays.stream(bundles).sorted(byState.thenComparing(bySymbolicName)).forEachOrdered(b -> { String state = toBundleState(b.getState()); - log.info(state + " | " + b.getSymbolicName() + " (" + b.getVersion() + ")"); + log.info(state + " | " + b.getSymbolicName() + " (" + b.getVersion() + ") at " + b.getLocation()); }); ServiceTracker st = new ServiceTracker<>( framework.getBundleContext(), ServiceComponentRuntime.class, null);