Bug 266406 [registry] Warning for fragment contributions to non-singleton bundle
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryMessages.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryMessages.java
index 8ada703..ff1bdf8 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryMessages.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryMessages.java
@@ -50,6 +50,7 @@
public static String parse_process;
public static String parse_failedParsingManifest;
public static String parse_nonSingleton;
+ public static String parse_nonSingletonFragment;
public static String parse_problems;
public static String parse_duplicateExtension;
public static String parse_duplicateExtensionPoint;
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/messages.properties b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/messages.properties
index a3c1a3c..8dc89ef 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/messages.properties
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/messages.properties
@@ -39,6 +39,7 @@
parse_process = Processing XML extension registry contribution
parse_failedParsingManifest = Could not parse XML contribution for \"{0}\". Any contributed extensions and extension points will be ignored.
parse_nonSingleton = The extensions and extension-points from the bundle \"{0}\" are ignored. The bundle is not marked as singleton.
+parse_nonSingletonFragment = The extensions and extension-points from the bundle \"{0}\" are ignored. The host bundle \"{1}\" is not marked as singleton.
parse_problems = Problems parsing plug-in manifest for: \"{0}\".
parse_duplicateExtension = Extensions supplied by \"{0}\" and \"{1}\" have the same Id: \"{2}\".
parse_duplicateExtensionPoint = Ignored duplicate extension point \"{0}\" supplied by \"{1}\".
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EclipseBundleListener.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EclipseBundleListener.java
index 4e8d3bc..0a91381 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EclipseBundleListener.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EclipseBundleListener.java
@@ -124,8 +124,8 @@
// If the bundle is not a singleton, then it is not added
if (!isSingleton(bundle)) {
if (report) {
- String message = NLS.bind(RegistryMessages.parse_nonSingleton, bundle.getLocation());
- RuntimeLog.log(new Status(IStatus.INFO, RegistryMessages.OWNER_NAME, 0, message, null));
+ String message = NLS.bind(RegistryMessages.parse_nonSingleton, bundle.getSymbolicName());
+ RuntimeLog.log(new Status(IStatus.WARNING, RegistryMessages.OWNER_NAME, 0, message, null));
}
return null;
}
@@ -141,8 +141,8 @@
return extensionURL;
if (report) {
- String message = NLS.bind(RegistryMessages.parse_nonSingleton, hosts[0].getLocation());
- RuntimeLog.log(new Status(IStatus.INFO, RegistryMessages.OWNER_NAME, 0, message, null));
+ String message = NLS.bind(RegistryMessages.parse_nonSingletonFragment, bundle.getSymbolicName(), hosts[0].getSymbolicName());
+ RuntimeLog.log(new Status(IStatus.WARNING, RegistryMessages.OWNER_NAME, 0, message, null));
}
return null;
}
@@ -155,7 +155,7 @@
IContributor contributor = ContributorFactoryOSGi.createContributor(bundle);
if (registry.hasContributor(contributor))
return;
- URL pluginManifest = getExtensionURL(bundle, registry.debug());
+ URL pluginManifest = getExtensionURL(bundle, true);
if (pluginManifest == null)
return;
InputStream is;
