Refactored based on decision that the builder would not be API, at least for now, since all of the known entry providers currently reside in the module. The remaining API is the resolution report and its listener.

Added the filtered_by_hook and singleton entries along with tests.

Fixed issue in ModuleResolver.ResolveProcess.selectSingletons where a loop was executing unnecessarily and adding a duplicate
entry to the report.

1 files changed, 2 insertions, 1 deletions

diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java
index 6878d6afe..db11fa3f6 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java
@@ -17,6 +17,7 @@ import org.eclipse.osgi.internal.loader.*;
 import org.eclipse.osgi.storage.BundleInfo.Generation;
 import org.eclipse.osgi.storage.Storage;
 import org.osgi.framework.*;
+import org.osgi.framework.hooks.resolver.ResolverHookFactory;
 import org.osgi.framework.namespace.HostNamespace;
 import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.service.resolver.ResolutionException;
@@ -64,7 +65,7 @@ public class EquinoxContainerAdaptor extends ModuleContainerAdaptor {
 	}
 
 	@Override
-	public ModuleResolverHookFactory getResolverHookFactory() {
+	public ResolverHookFactory getResolverHookFactory() {
 		return hooks.getResolverHookFactory();
 	}