Unify connect.properties location and fix release-notes of OSGi-Connect

eclipse-tycho · Sep 19, 2022 · 27844e3 · 27844e3
1 parent 6fef800
commit 27844e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
 ```
 <dependency>

diff --git a/...ect/src/main/java/org/eclipse/sisu/osgi/connect/PlexusFrameworkConnectServiceFactory.java b/...ect/src/main/java/org/eclipse/sisu/osgi/connect/PlexusFrameworkConnectServiceFactory.java
@@ -203,7 +203,7 @@ private static Map<String, String> readProperties(ClassLoader classloader, Logge
 		Map<String, String> frameworkProperties = new HashMap<>();
 		Enumeration<URL> resources;
 		try {
-			resources = classloader.getResources("META-INF/sisu-connect.properties");
+			resources = classloader.getResources("META-INF/sisu/connect.properties");
 		} catch (IOException e1) {
 			return frameworkProperties;
 		}
@@ -231,7 +231,8 @@ private static void printFrameworkState(Framework framework, Logger log) {
 		Comparator<Bundle> byState = Comparator.comparingInt(Bundle::getState);
 		Arrays.stream(bundles).sorted(byState.thenComparing(bySymbolicName)).forEachOrdered(bundle -> {
 			String state = toBundleState(bundle.getState());
-			log.info(state + " | " + bundle.getSymbolicName() + " (" + bundle.getVersion() + ")");
+			log.info(state + " | " + bundle.getSymbolicName() + " (" + bundle.getVersion() + ") at "
+					+ bundle.getLocation());
 		});
 		ServiceTracker<ServiceComponentRuntime, ServiceComponentRuntime> st = new ServiceTracker<>(
 				framework.getBundleContext(), ServiceComponentRuntime.class, null);